Commit ef1c4a6f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'media/v4.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

Pull media updates from Mauro Carvalho Chehab:

 - new CEC pin injection code for testing purposes

 - DVB frontend cxd2099 promoted from staging

 - new platform driver for Sony cxd2880 DVB devices

 - new sensor drivers: mt9t112, ov2685, ov5695, ov772x, tda1997x,
   tw9910.c

 - removal of unused cx18 and ivtv alsa mixers

 - the reneseas-ceu driver doesn't depend on soc_camera anymore and
   moved from staging

 - removed the mantis_vp3028 driver, unused since 2009

 - s5p-mfc: add support for version 10 of the MSP

 - added a decoder for imon protocol

 - atomisp: lots of cleanups

 - imx074 and mt9t031: don't depend on soc_camera anymore, being
   promoted from staging

 - added helper functions to better support DVB I2C binding

 - lots of driver improvements and cleanups

* tag 'media/v4.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (438 commits)
  media: v4l2-ioctl: rename a temp var that stores _IOC_SIZE(cmd)
  media: fimc-capture: get rid of two warnings
  media: dvb-usb-v2: fix a missing dependency of I2C_MUX
  media: uvc: to the right check at uvc_ioctl_enum_framesizes()
  media: cec-core: fix a bug at cec_error_inj_write()
  media: tda9840: cleanup a warning
  media: tm6000:  avoid casting just to print pointer address
  media: em28xx-input: improve error handling code
  media: zr364xx: avoid casting just to print pointer address
  media: vivid-radio-rx: add a cast to avoid a warning
  media: saa7134-alsa: don't use casts to print a buffer address
  media: solo6x10: get rid of an address space warning
  media: zoran: don't cast pointers to print them
  media: ir-kbd-i2c: change the if logic to avoid a warning
  media: ir-kbd-i2c: improve error handling code
  media: saa7134-input: improve error handling
  media: s2255drv: fix a casting warning
  media: ivtvfb: Cleanup some warnings
  media: videobuf-dma-sg: Fix a weird cast
  soc_camera: fix a weird cast on printk
  ...
parents 147a89bc f8a695c4

Documentation/ABI/testing/debugfs-cec-error-inj

0 → 100644
+40 −0
Original line number Diff line number Diff line 
What:		/sys/kernel/debug/cec/*/error-inj

Date:		March 2018

Contact:	Hans Verkuil <hans.verkuil@cisco.com>

Description:



The CEC Framework allows for CEC error injection commands through

debugfs. Drivers that support this will create an error-inj file

through which the error injection commands can be given.



The basic syntax is as follows:



Leading spaces/tabs are ignored. If the next character is a '#' or the

end of the line was reached, then the whole line is ignored. Otherwise

a command is expected.



It is up to the driver to decide what commands to implement. The only

exception is that the command 'clear' without any arguments must be

implemented and that it will remove all current error injection

commands.



This ensures that you can always do 'echo clear >error-inj' to clear any

error injections without having to know the details of the driver-specific

commands.



Note that the output of 'error-inj' shall be valid as input to 'error-inj'.

So this must work:



	$ cat error-inj >einj.txt

	$ cat einj.txt >error-inj



Other than these basic rules described above this ABI is not considered

stable and may change in the future.



Drivers that implement this functionality must document the commands as

part of the CEC documentation and must keep that documentation up to date

when changes are made.



The following CEC error injection implementations exist:



- Documentation/media/uapi/cec/cec-pin-error-inj.rst

Documentation/devicetree/bindings/media/coda.txt

+3 −2
Original line number Diff line number Diff line
@@ -7,8 +7,9 @@ called VPU (Video Processing Unit). 
Required properties:

- compatible : should be "fsl,<chip>-src" for i.MX SoCs:

  (a) "fsl,imx27-vpu" for CodaDx6 present in i.MX27

  (b) "fsl,imx53-vpu" for CODA7541 present in i.MX53

  (c) "fsl,imx6q-vpu" for CODA960 present in i.MX6q

  (b) "fsl,imx51-vpu" for CodaHx4 present in i.MX51

  (c) "fsl,imx53-vpu" for CODA7541 present in i.MX53

  (d) "fsl,imx6q-vpu" for CODA960 present in i.MX6q

- reg: should be register base and length as documented in the

  SoC reference manual

- interrupts : Should contain the VPU interrupt. For CODA960,

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

+16 −2
Original line number Diff line number Diff line
@@ -13,7 +13,11 @@ Required Properties: 
    - "adi,adv7611" for the ADV7611

    - "adi,adv7612" for the ADV7612



  - reg: I2C slave address

  - reg: I2C slave addresses

    The ADV76xx has up to thirteen 256-byte maps that can be accessed via the

    main I2C ports. Each map has it own I2C address and acts as a standard

    slave device on the I2C bus. The main address is mandatory, others are

    optional and revert to defaults if not specified.



  - hpd-gpios: References to the GPIOs that control the HDMI hot-plug

    detection pins, one per HDMI input. The active flag indicates the GPIO
@@ -35,6 +39,11 @@ Optional Properties: 


  - reset-gpios: Reference to the GPIO connected to the device's reset pin.

  - default-input: Select which input is selected after reset.

  - reg-names : Names of maps with programmable addresses.

		It can contain any map needing a non-default address.

		Possible maps names are :

		  "main", "avlink", "cec", "infoframe", "esdp", "dpp", "afe",

		  "rep", "edid", "hdmi", "test", "cp", "vdp"



Optional Endpoint Properties:
@@ -52,7 +61,12 @@ Example: 


	hdmi_receiver@4c {

		compatible = "adi,adv7611";

		reg = <0x4c>;

		/*

		 * The edid page will be accessible @ 0x66 on the I2C bus. All

		 * other maps will retain their default addresses.

		 */

		reg = <0x4c>, <0x66>;

		reg-names "main", "edid";



		reset-gpios = <&ioexp 0 GPIO_ACTIVE_LOW>;

		hpd-gpios = <&ioexp 2 GPIO_ACTIVE_HIGH>;

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

0 → 100644
+41 −0
Original line number Diff line number Diff line 
* Omnivision OV2685 MIPI CSI-2 sensor



Required Properties:

- compatible: shall be "ovti,ov2685"

- clocks: reference to the xvclk input clock

- clock-names: shall be "xvclk"

- avdd-supply: Analog voltage supply, 2.8 volts

- dovdd-supply: Digital I/O voltage supply, 1.8 volts

- dvdd-supply: Digital core voltage supply, 1.8 volts

- reset-gpios: Low active reset gpio



The device node shall contain one 'port' child node with an

'endpoint' subnode for its digital output video port,

in accordance with the video interface bindings defined in

Documentation/devicetree/bindings/media/video-interfaces.txt.

The endpoint optional property 'data-lanes' shall be "<1>".



Example:

&i2c7 {

	ov2685: camera-sensor@3c {

		compatible = "ovti,ov2685";

		reg = <0x3c>;

		pinctrl-names = "default";

		pinctrl-0 = <&clk_24m_cam>;



		clocks = <&cru SCLK_TESTCLKOUT1>;

		clock-names = "xvclk";



		avdd-supply = <&pp2800_cam>;

		dovdd-supply = <&pp1800>;

		dvdd-supply = <&pp1800>;

		reset-gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;



		port {

			ucam_out: endpoint {

				remote-endpoint = <&mipi_in_ucam>;

				data-lanes = <1>;

			};

		};

	};

};

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

0 → 100644
+41 −0
Original line number Diff line number Diff line 
* Omnivision OV5695 MIPI CSI-2 sensor



Required Properties:

- compatible: shall be "ovti,ov5695"

- clocks: reference to the xvclk input clock

- clock-names: shall be "xvclk"

- avdd-supply: Analog voltage supply, 2.8 volts

- dovdd-supply: Digital I/O voltage supply, 1.8 volts

- dvdd-supply: Digital core voltage supply, 1.2 volts

- reset-gpios: Low active reset gpio



The device node shall contain one 'port' child node with an

'endpoint' subnode for its digital output video port,

in accordance with the video interface bindings defined in

Documentation/devicetree/bindings/media/video-interfaces.txt.

The endpoint optional property 'data-lanes' shall be "<1 2>".



Example:

&i2c7 {

	ov5695: camera-sensor@36 {

		compatible = "ovti,ov5695";

		reg = <0x36>;

		pinctrl-names = "default";

		pinctrl-0 = <&clk_24m_cam>;



		clocks = <&cru SCLK_TESTCLKOUT1>;

		clock-names = "xvclk";



		avdd-supply = <&pp2800_cam>;

		dovdd-supply = <&pp1800>;

		dvdd-supply = <&pp1250_cam>;

		reset-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>;



		port {

			wcam_out: endpoint {

				remote-endpoint = <&mipi_in_wcam>;

				data-lanes = <1 2>;

			};

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE