forked from torvalds/linux
-
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/v5.1-1' of git://git.kernel.org/pub/scm/linux/kernel…
…/git/mchehab/linux-media Pull media updates from Mauro Carvalho Chehab: - remove sensor drivers that got converted from soc_camera - remaining soc_camera drivers got moved to staging - some documentation cleanups and improvements - the imx staging driver now supports imx7 - the ov9640, mt9m001 and mt9m111 got converted from soc_camera - the vim2m driver now does what a m2m convert driver expects to do - epoll() fixes on media subsystems - several drivers fixes, typos, cleanups and improvements * tag 'media/v5.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (346 commits) media: dvb/earth-pt1: fix wrong initialization for demod blocks media: vim2m: Address some coding style issues media: vim2m: don't use BUG() media: vim2m: speedup passthrough copy media: vim2m: add an horizontal scaler media: vim2m: don't accept YUYV anymore as output format media: vim2m: add vertical linear scaler media: vim2m: better handle cap/out buffers with different sizes media: vim2m: use different framesizes for bayer formats media: vim2m: add support for VIDIOC_ENUM_FRAMESIZES media: vim2m: ensure that width is multiple of two media: vim2m: improve debug messages media: vim2m: add bayer capture formats media: a few more typos at staging, pci, platform, radio and usb media: Documentation: fix several typos media: staging: fix several typos media: include: fix several typos media: common: fix several typos media: v4l2-core: fix several typos media: usb: fix several typos ...
- Loading branch information
Showing
536 changed files
with
15,295 additions
and
15,371 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
20 changes: 20 additions & 0 deletions
20
Documentation/devicetree/bindings/media/i2c/melexis,mlx90640.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,20 @@ | ||
| * Melexis MLX90640 FIR Sensor | ||
|
|
||
| Melexis MLX90640 FIR sensor support which allows recording of thermal data | ||
| with 32x24 resolution excluding 2 lines of coefficient data that is used by | ||
| userspace to render processed frames. | ||
|
|
||
| Required Properties: | ||
| - compatible : Must be "melexis,mlx90640" | ||
| - reg : i2c address of the device | ||
|
|
||
| Example: | ||
|
|
||
| i2c0@1c22000 { | ||
| ... | ||
| mlx90640@33 { | ||
| compatible = "melexis,mlx90640"; | ||
| reg = <0x33>; | ||
| }; | ||
| ... | ||
| }; |
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,38 @@ | ||
| MT9M001: 1/2-Inch Megapixel Digital Image Sensor | ||
|
|
||
| The MT9M001 is an SXGA-format with a 1/2-inch CMOS active-pixel digital | ||
| image sensor. It is programmable through I2C interface. | ||
|
|
||
| Required Properties: | ||
|
|
||
| - compatible: shall be "onnn,mt9m001". | ||
| - clocks: reference to the master clock into sensor | ||
|
|
||
| Optional Properties: | ||
|
|
||
| - reset-gpios: GPIO handle which is connected to the reset pin of the chip. | ||
| Active low. | ||
| - standby-gpios: GPIO handle which is connected to the standby pin of the chip. | ||
| Active high. | ||
|
|
||
| The device node must contain one 'port' child node with one 'endpoint' child | ||
| sub-node for its digital output video port, in accordance with the video | ||
| interface bindings defined in: | ||
| Documentation/devicetree/bindings/media/video-interfaces.txt | ||
|
|
||
| Example: | ||
|
|
||
| &i2c1 { | ||
| camera-sensor@5d { | ||
| compatible = "onnn,mt9m001"; | ||
| reg = <0x5d>; | ||
| reset-gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; | ||
| standby-gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>; | ||
| clocks = <&camera_clk>; | ||
| port { | ||
| mt9m001_out: endpoint { | ||
| remote-endpoint = <&vcap_in>; | ||
| }; | ||
| }; | ||
| }; | ||
| }; |
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,45 @@ | ||
| Freescale i.MX7 CMOS Sensor Interface | ||
| ===================================== | ||
|
|
||
| csi node | ||
| -------- | ||
|
|
||
| This is device node for the CMOS Sensor Interface (CSI) which enables the chip | ||
| to connect directly to external CMOS image sensors. | ||
|
|
||
| Required properties: | ||
|
|
||
| - compatible : "fsl,imx7-csi"; | ||
| - reg : base address and length of the register set for the device; | ||
| - interrupts : should contain CSI interrupt; | ||
| - clocks : list of clock specifiers, see | ||
| Documentation/devicetree/bindings/clock/clock-bindings.txt for details; | ||
| - clock-names : must contain "axi", "mclk" and "dcic" entries, matching | ||
| entries in the clock property; | ||
|
|
||
| The device node shall contain one 'port' child node with one child 'endpoint' | ||
| node, according to the bindings defined in: | ||
| Documentation/devicetree/bindings/media/video-interfaces.txt. | ||
|
|
||
| In the following example a remote endpoint is a video multiplexer. | ||
|
|
||
| example: | ||
|
|
||
| csi: csi@30710000 { | ||
| #address-cells = <1>; | ||
| #size-cells = <0>; | ||
|
|
||
| compatible = "fsl,imx7-csi"; | ||
| reg = <0x30710000 0x10000>; | ||
| interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; | ||
| clocks = <&clks IMX7D_CLK_DUMMY>, | ||
| <&clks IMX7D_CSI_MCLK_ROOT_CLK>, | ||
| <&clks IMX7D_CLK_DUMMY>; | ||
| clock-names = "axi", "mclk", "dcic"; | ||
|
|
||
| port { | ||
| csi_from_csi_mux: endpoint { | ||
| remote-endpoint = <&csi_mux_to_csi>; | ||
| }; | ||
| }; | ||
| }; |
90 changes: 90 additions & 0 deletions
90
Documentation/devicetree/bindings/media/imx7-mipi-csi2.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,90 @@ | ||
| Freescale i.MX7 Mipi CSI2 | ||
| ========================= | ||
|
|
||
| mipi_csi2 node | ||
| -------------- | ||
|
|
||
| This is the device node for the MIPI CSI-2 receiver core in i.MX7 SoC. It is | ||
| compatible with previous version of Samsung D-phy. | ||
|
|
||
| Required properties: | ||
|
|
||
| - compatible : "fsl,imx7-mipi-csi2"; | ||
| - reg : base address and length of the register set for the device; | ||
| - interrupts : should contain MIPI CSIS interrupt; | ||
| - clocks : list of clock specifiers, see | ||
| Documentation/devicetree/bindings/clock/clock-bindings.txt for details; | ||
| - clock-names : must contain "pclk", "wrap" and "phy" entries, matching | ||
| entries in the clock property; | ||
| - power-domains : a phandle to the power domain, see | ||
| Documentation/devicetree/bindings/power/power_domain.txt for details. | ||
| - reset-names : should include following entry "mrst"; | ||
| - resets : a list of phandle, should contain reset entry of | ||
| reset-names; | ||
| - phy-supply : from the generic phy bindings, a phandle to a regulator that | ||
| provides power to MIPI CSIS core; | ||
|
|
||
| Optional properties: | ||
|
|
||
| - clock-frequency : The IP's main (system bus) clock frequency in Hz, default | ||
| value when this property is not specified is 166 MHz; | ||
| - fsl,csis-hs-settle : differential receiver (HS-RX) settle time; | ||
|
|
||
| The device node should contain two 'port' child nodes with one child 'endpoint' | ||
| node, according to the bindings defined in: | ||
| Documentation/devicetree/bindings/ media/video-interfaces.txt. | ||
| The following are properties specific to those nodes. | ||
|
|
||
| port node | ||
| --------- | ||
|
|
||
| - reg : (required) can take the values 0 or 1, where 0 shall be | ||
| related to the sink port and port 1 shall be the source | ||
| one; | ||
|
|
||
| endpoint node | ||
| ------------- | ||
|
|
||
| - data-lanes : (required) an array specifying active physical MIPI-CSI2 | ||
| data input lanes and their mapping to logical lanes; this | ||
| shall only be applied to port 0 (sink port), the array's | ||
| content is unused only its length is meaningful, | ||
| in this case the maximum length supported is 2; | ||
|
|
||
| example: | ||
|
|
||
| mipi_csi: mipi-csi@30750000 { | ||
| #address-cells = <1>; | ||
| #size-cells = <0>; | ||
|
|
||
| compatible = "fsl,imx7-mipi-csi2"; | ||
| reg = <0x30750000 0x10000>; | ||
| interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>; | ||
| clocks = <&clks IMX7D_IPG_ROOT_CLK>, | ||
| <&clks IMX7D_MIPI_CSI_ROOT_CLK>, | ||
| <&clks IMX7D_MIPI_DPHY_ROOT_CLK>; | ||
| clock-names = "pclk", "wrap", "phy"; | ||
| clock-frequency = <166000000>; | ||
| power-domains = <&pgc_mipi_phy>; | ||
| phy-supply = <®_1p0d>; | ||
| resets = <&src IMX7_RESET_MIPI_PHY_MRST>; | ||
| reset-names = "mrst"; | ||
| fsl,csis-hs-settle = <3>; | ||
|
|
||
| port@0 { | ||
| reg = <0>; | ||
|
|
||
| mipi_from_sensor: endpoint { | ||
| remote-endpoint = <&ov2680_to_mipi>; | ||
| data-lanes = <1>; | ||
| }; | ||
| }; | ||
|
|
||
| port@1 { | ||
| reg = <1>; | ||
|
|
||
| mipi_vc0_to_csi_mux: endpoint { | ||
| remote-endpoint = <&csi_mux_from_mipi_vc0>; | ||
| }; | ||
| }; | ||
| }; |
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
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,26 @@ | ||
| * Silicon Labs FM Radio receiver | ||
|
|
||
| The Silicon Labs Si470x is family of FM radio receivers with receive power scan | ||
| supporting 76-108 MHz, programmable through an I2C interface. | ||
| Some of them includes an RDS encoder. | ||
|
|
||
| Required Properties: | ||
| - compatible: Should contain "silabs,si470x" | ||
| - reg: the I2C address of the device | ||
|
|
||
| Optional Properties: | ||
| - interrupts : The interrupt number | ||
| - reset-gpios: GPIO specifier for the chips reset line | ||
|
|
||
| Example: | ||
|
|
||
| &i2c2 { | ||
| si470x@63 { | ||
| compatible = "silabs,si470x"; | ||
| reg = <0x63>; | ||
|
|
||
| interrupt-parent = <&gpj2>; | ||
| interrupts = <4 IRQ_TYPE_EDGE_FALLING>; | ||
| reset-gpios = <&gpj2 5 GPIO_ACTIVE_HIGH>; | ||
| }; | ||
| }; |
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
Oops, something went wrong.