-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'media/v4.16-2' of git://git.kernel.org/pub/scm/linux/kerne…
…l/git/mchehab/linux-media Pull media updates from Mauro Carvalho Chehab: - videobuf2 was moved to a media/common dir, as it is now used by the DVB subsystem too - Digital TV core memory mapped support interface - new sensor driver: ov7740 - several improvements at ddbridge driver - new V4L2 driver: IPU3 CIO2 CSI-2 receiver unit, found on some Intel SoCs - new tuner driver: tda18250 - finally got rid of all LIRC staging drivers - as we don't have old lirc drivers anymore, restruct the lirc device code - add support for UVC metadata - add a new staging driver for NVIDIA Tegra Video Decoder Engine - DVB kAPI headers moved to include/media - synchronize the kAPI and uAPI for the DVB subsystem, removing the gap for non-legacy APIs - reduce the kAPI gap for V4L2 - lots of other driver enhancements, cleanups, etc. * tag 'media/v4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (407 commits) media: v4l2-compat-ioctl32.c: make ctrl_is_pointer work for subdevs media: v4l2-compat-ioctl32.c: refactor compat ioctl32 logic media: v4l2-compat-ioctl32.c: don't copy back the result for certain errors media: v4l2-compat-ioctl32.c: drop pr_info for unknown buffer type media: v4l2-compat-ioctl32.c: copy clip list in put_v4l2_window32 media: v4l2-compat-ioctl32.c: fix ctrl_is_pointer media: v4l2-compat-ioctl32.c: copy m.userptr in put_v4l2_plane32 media: v4l2-compat-ioctl32.c: avoid sizeof(type) media: v4l2-compat-ioctl32.c: move 'helper' functions to __get/put_v4l2_format32 media: v4l2-compat-ioctl32.c: fix the indentation media: v4l2-compat-ioctl32.c: add missing VIDIOC_PREPARE_BUF media: v4l2-ioctl.c: don't copy back the result for -ENOTTY media: v4l2-ioctl.c: use check_fmt for enum/g/s/try_fmt media: vivid: fix module load error when enabling fb and no_error_inj=1 media: dvb_demux: improve debug messages media: dvb_demux: Better handle discontinuity errors media: cxusb, dib0700: ignore XC2028_I2C_FLUSH media: ts2020: avoid integer overflows on 32 bit machines media: i2c: ov7740: use gpio/consumer.h instead of gpio.h media: entity: Add a nop variant of media_entity_cleanup ...
- Loading branch information
Showing
953 changed files
with
21,723 additions
and
14,035 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
* Omnivision OV7740 CMOS image sensor | ||
|
||
The Omnivision OV7740 image sensor supports multiple output image | ||
size, such as VGA, and QVGA, CIF and any size smaller. It also | ||
supports the RAW RGB and YUV output formats. | ||
|
||
The common video interfaces bindings (see video-interfaces.txt) should | ||
be used to specify link to the image data receiver. The OV7740 device | ||
node should contain one 'port' child node with an 'endpoint' subnode. | ||
|
||
Required Properties: | ||
- compatible: "ovti,ov7740". | ||
- reg: I2C slave address of the sensor. | ||
- clocks: Reference to the xvclk input clock. | ||
- clock-names: "xvclk". | ||
|
||
Optional Properties: | ||
- reset-gpios: Rreference to the GPIO connected to the reset_b pin, | ||
if any. Active low with pull-ip resistor. | ||
- powerdown-gpios: Reference to the GPIO connected to the pwdn pin, | ||
if any. Active high with pull-down resistor. | ||
|
||
Endpoint node mandatory properties: | ||
- remote-endpoint: A phandle to the bus receiver's endpoint node. | ||
|
||
Example: | ||
|
||
i2c1: i2c@fc028000 { | ||
ov7740: camera@21 { | ||
compatible = "ovti,ov7740"; | ||
reg = <0x21>; | ||
pinctrl-names = "default"; | ||
pinctrl-0 = <&pinctrl_sensor_power &pinctrl_sensor_reset>; | ||
clocks = <&isc>; | ||
clock-names = "xvclk"; | ||
assigned-clocks = <&isc>; | ||
assigned-clock-rates = <24000000>; | ||
reset-gpios = <&pioA 43 GPIO_ACTIVE_LOW>; | ||
powerdown-gpios = <&pioA 44 GPIO_ACTIVE_HIGH>; | ||
|
||
port { | ||
ov7740_0: endpoint { | ||
remote-endpoint = <&isc_0>; | ||
}; | ||
}; | ||
}; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55
Documentation/devicetree/bindings/media/nvidia,tegra-vde.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
NVIDIA Tegra Video Decoder Engine | ||
|
||
Required properties: | ||
- compatible : Must contain one of the following values: | ||
- "nvidia,tegra20-vde" | ||
- "nvidia,tegra30-vde" | ||
- "nvidia,tegra114-vde" | ||
- "nvidia,tegra124-vde" | ||
- "nvidia,tegra132-vde" | ||
- reg : Must contain an entry for each entry in reg-names. | ||
- reg-names : Must include the following entries: | ||
- sxe | ||
- bsev | ||
- mbe | ||
- ppe | ||
- mce | ||
- tfe | ||
- ppb | ||
- vdma | ||
- frameid | ||
- iram : Must contain phandle to the mmio-sram device node that represents | ||
IRAM region used by VDE. | ||
- interrupts : Must contain an entry for each entry in interrupt-names. | ||
- interrupt-names : Must include the following entries: | ||
- sync-token | ||
- bsev | ||
- sxe | ||
- clocks : Must include the following entries: | ||
- vde | ||
- resets : Must include the following entries: | ||
- vde | ||
|
||
Example: | ||
|
||
video-codec@6001a000 { | ||
compatible = "nvidia,tegra20-vde"; | ||
reg = <0x6001a000 0x1000 /* Syntax Engine */ | ||
0x6001b000 0x1000 /* Video Bitstream Engine */ | ||
0x6001c000 0x100 /* Macroblock Engine */ | ||
0x6001c200 0x100 /* Post-processing Engine */ | ||
0x6001c400 0x100 /* Motion Compensation Engine */ | ||
0x6001c600 0x100 /* Transform Engine */ | ||
0x6001c800 0x100 /* Pixel prediction block */ | ||
0x6001ca00 0x100 /* Video DMA */ | ||
0x6001d800 0x300 /* Video frame controls */>; | ||
reg-names = "sxe", "bsev", "mbe", "ppe", "mce", | ||
"tfe", "ppb", "vdma", "frameid"; | ||
iram = <&vde_pool>; /* IRAM region */ | ||
interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>, /* Sync token interrupt */ | ||
<GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>, /* BSE-V interrupt */ | ||
<GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>; /* SXE interrupt */ | ||
interrupt-names = "sync-token", "bsev", "sxe"; | ||
clocks = <&tegra_car TEGRA20_CLK_VDE>; | ||
resets = <&tegra_car 61>; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -66,6 +66,6 @@ Example: | |
tpg1_out: endpoint { | ||
remote-endpoint = <&switch_in0>; | ||
}; | ||
}: | ||
}; | ||
}; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
Digital TV Conditional Access kABI | ||
---------------------------------- | ||
|
||
.. kernel-doc:: drivers/media/dvb-core/dvb_ca_en50221.h | ||
.. kernel-doc:: include/media/dvb_ca_en50221.h |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
Digital TV Network kABI | ||
----------------------- | ||
|
||
.. kernel-doc:: drivers/media/dvb-core/dvb_net.h | ||
.. kernel-doc:: include/media/dvb_net.h |
Oops, something went wrong.