Commit 96a6de1a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents 36011ddc 15d90a6a

Documentation/devicetree/bindings/media/i2c/adv748x.txt

+10 −1
Original line number Diff line number Diff line
@@ -48,7 +48,16 @@ are numbered as follows. 
	  TXA		source		10

	  TXB		source		11



The digital output port nodes must contain at least one endpoint.

The digital output port nodes, when present, shall contain at least one

endpoint. Each of those endpoints shall contain the data-lanes property as

described in video-interfaces.txt.



Required source endpoint properties:

  - data-lanes: an array of physical data lane indexes

    The accepted value(s) for this property depends on which of the two

    sources are described. For TXA 1, 2 or 4 data lanes can be described

    while for TXB only 1 data lane is valid. See video-interfaces.txt

    for detailed description.



Ports are optional if they are not connected to anything at the hardware level.

Documentation/devicetree/bindings/media/i2c/melexis,mlx90640.txt

0 → 100644
+20 −0
Original line number Diff line number Diff line 
* 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>;

		};

		...

	};

Documentation/devicetree/bindings/media/i2c/mt9m001.txt

0 → 100644
+38 −0
Original line number Diff line number Diff line 
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>;

				};

			};

		};

	};

Documentation/devicetree/bindings/media/i2c/ov5645.txt

+3 −3
Original line number Diff line number Diff line
@@ -26,9 +26,9 @@ Example: 
	&i2c1 {

		...



		ov5645: ov5645@78 {

		ov5645: ov5645@3c {

			compatible = "ovti,ov5645";

			reg = <0x78>;

			reg = <0x3c>;



			enable-gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;

			reset-gpios = <&gpio5 20 GPIO_ACTIVE_LOW>;
@@ -37,7 +37,7 @@ Example: 


			clocks = <&clks 200>;

			clock-names = "xclk";

			clock-frequency = <23880000>;

			clock-frequency = <24000000>;



			vdddo-supply = <&camera_dovdd_1v8>;

			vdda-supply = <&camera_avdd_2v8>;

Documentation/devicetree/bindings/media/imx7-csi.txt

0 → 100644
+45 −0
Original line number Diff line number Diff line 
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>;

                                };

                        };

                };

CRA Git | Maintained and supported by SUSTech CRA and CCSE