Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 134bf98c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull media updates from Mauro Carvalho Chehab:

 - new dvb frontend driver: lnbh29

 - new sensor drivers: imx319 and imx 355

 - some old soc_camera driver renames to avoid conflict with new
   drivers

 - new i.MX Pixel Pipeline (PXP) mem-to-mem platform driver

 - a new V4L2 frontend for the FWHT codec

 - several other improvements, bug fixes, code cleanups, etc

* tag 'media/v4.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (289 commits)
  media: rename soc_camera I2C drivers
  media: cec: forgot to cancel delayed work
  media: vivid: Support 480p for webcam capture
  media: v4l2-tpg: fix kernel oops when enabling HFLIP and OSD
  media: vivid: Add 16-bit bayer to format list
  media: v4l2-tpg-core: Add 16-bit bayer
  media: pvrusb2: replace `printk` with `pr_*`
  media: venus: vdec: fix decoded data size
  media: cx231xx: fix potential sign-extension overflow on large shift
  media: dt-bindings: media: rcar_vin: add device tree support for r8a7744
  media: isif: fix a NULL pointer dereference bug
  media: exynos4-is: make const array config_ids static
  media: cx23885: make const array addr_list static
  media: ivtv: make const array addr_list static
  media: bttv-input: make const array addr_list static
  media: cx18: Don't check for address of video_dev
  media: dw9807-vcm: Fix probe error handling
  media: dw9714: Remove useless error message
  media: dw9714: Fix error handling in probe function
  media: cec: name for RC passthrough device does not need 'RC for'
  ...
parents 044ee890 3b796aa6

Documentation/devicetree/bindings/media/fsl-pxp.txt

0 → 100644
+26 −0
Original line number Diff line number Diff line 
Freescale Pixel Pipeline

========================



The Pixel Pipeline (PXP) is a memory-to-memory graphics processing engine

that supports scaling, colorspace conversion, alpha blending, rotation, and

pixel conversion via lookup table. Different versions are present on various

i.MX SoCs from i.MX23 to i.MX7.



Required properties:

- compatible: should be "fsl,<soc>-pxp", where SoC can be one of imx23, imx28,

  imx6dl, imx6sl, imx6ul, imx6sx, imx6ull, or imx7d.

- reg: the register base and size for the device registers

- interrupts: the PXP interrupt, two interrupts for imx6ull and imx7d.

- clock-names: should be "axi"

- clocks: the PXP AXI clock



Example:



pxp@21cc000 {

	compatible = "fsl,imx6ull-pxp";

	reg = <0x021cc000 0x4000>;

	interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,

		     <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>;

	clock-names = "axi";

	clocks = <&clks IMX6UL_CLK_PXP>;

};

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

+16 −4
Original line number Diff line number Diff line
@@ -10,7 +10,11 @@ Required Properties: 
    - "adi,adv7481" for the ADV7481

    - "adi,adv7482" for the ADV7482



  - reg: I2C slave address

  - reg: I2C slave addresses

    The ADV748x has up to twelve 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 remain at default values if not specified.



Optional Properties:
@@ -18,6 +22,11 @@ Optional Properties: 
		     "intrq3". All interrupts are optional. The "intrq3" interrupt

		     is only available on the adv7481

  - interrupts: Specify the interrupt lines for the ADV748x

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

		It shall contain all maps needing a non-default address.

		Possible map names are:

		  "main", "dpll", "cp", "hdmi", "edid", "repeater",

		  "infoframe", "cbus", "cec", "sdp", "txa", "txb"



The device node must contain one 'port' child node per device input and output

port, in accordance with the video interface bindings defined in
@@ -47,7 +56,10 @@ Example: 


	video-receiver@70 {

		compatible = "adi,adv7482";

		reg = <0x70>;

		reg = <0x70 0x71 0x72 0x73 0x74 0x75

		       0x60 0x61 0x62 0x63 0x64 0x65>;

		reg-names = "main", "dpll", "cp", "hdmi", "edid", "repeater",

			    "infoframe", "cbus", "cec", "sdp", "txa", "txb";



		#address-cells = <1>;

		#size-cells = <0>;
@@ -73,7 +85,7 @@ Example: 
			};

		};



		port@10 {

		port@a {

			reg = <10>;



			adv7482_txa: endpoint {
@@ -83,7 +95,7 @@ Example: 
			};

		};



		port@11 {

		port@b {

			reg = <11>;



			adv7482_txb: endpoint {

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

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ Example: 
		 * other maps will retain their default addresses.

		 */

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

		reg-names "main", "edid";

		reg-names = "main", "edid";



		reset-gpios = <&ioexp 0 GPIO_ACTIVE_LOW>;

		hpd-gpios = <&ioexp 2 GPIO_ACTIVE_HIGH>;

Documentation/devicetree/bindings/media/rcar_vin.txt

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ on Gen3 platforms to a CSI-2 receiver. 


 - compatible: Must be one or more of the following

   - "renesas,vin-r8a7743" for the R8A7743 device

   - "renesas,vin-r8a7744" for the R8A7744 device

   - "renesas,vin-r8a7745" for the R8A7745 device

   - "renesas,vin-r8a7778" for the R8A7778 device

   - "renesas,vin-r8a7779" for the R8A7779 device