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

Commit 5d352e69 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull media updates from Mauro Carvalho Chehab:

 - Documentation for digital TV (both kAPI and uAPI) are now in sync
   with the implementation (except for legacy/deprecated ioctls). This
   is a major step, as there were always a gap there

 - New sensor driver: imx274

 - New cec driver: cec-gpio

 - New platform driver for rockship rga and tegra CEC

 - New RC driver: tango-ir

 - Several cleanups at atomisp driver

 - Core improvements for RC, CEC, V4L2 async probing support and DVB

 - Lots of drivers cleanup, fixes and improvements.

* tag 'media/v4.15-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (332 commits)
  dvb_frontend: don't use-after-free the frontend struct
  media: dib0700: fix invalid dvb_detach argument
  media: v4l2-ctrls: Don't validate BITMASK twice
  media: s5p-mfc: fix lockdep warning
  media: dvb-core: always call invoke_release() in fe_free()
  media: usb: dvb-usb-v2: dvb_usb_core: remove redundant code in dvb_usb_fe_sleep
  media: au0828: make const array addr_list static
  media: cx88: make const arrays default_addr_list and pvr2000_addr_list static
  media: drxd: make const array fastIncrDecLUT static
  media: usb: fix spelling mistake: "synchronuously" -> "synchronously"
  media: ddbridge: fix build warnings
  media: av7110: avoid 2038 overflow in debug print
  media: Don't do DMA on stack for firmware upload in the AS102 driver
  media: v4l: async: fix unregister for implicitly registered sub-device notifiers
  media: v4l: async: fix return of unitialized variable ret
  media: imx274: fix missing return assignment from call to imx274_mode_regs
  media: camss-vfe: always initialize reg at vfe_set_xbar_cfg()
  media: atomisp: make function calls cleaner
  media: atomisp: get rid of storage_class.h
  media: atomisp: get rid of wrong stddef.h include
  ...
parents 93ea0eb7 f2ecc3d0

Documentation/devicetree/bindings/media/cec-gpio.txt

0 → 100644
+32 −0
Original line number Diff line number Diff line 
* HDMI CEC GPIO driver



The HDMI CEC GPIO module supports CEC implementations where the CEC line

is hooked up to a pull-up GPIO line and - optionally - the HPD line is

hooked up to another GPIO line.



Required properties:

  - compatible: value must be "cec-gpio".

  - cec-gpios: gpio that the CEC line is connected to. The line should be

    tagged as open drain.



If the CEC line is associated with an HDMI receiver/transmitter, then the

following property is also required:



  - hdmi-phandle - phandle to the HDMI controller, see also cec.txt.



If the CEC line is not associated with an HDMI receiver/transmitter, then

the following property is optional:



  - hpd-gpios: gpio that the HPD line is connected to.



Example for the Raspberry Pi 3 where the CEC line is connected to

pin 26 aka BCM7 aka CE1 on the GPIO pin header and the HPD line is

connected to pin 11 aka BCM17:



#include <dt-bindings/gpio/gpio.h>



cec-gpio {

       compatible = "cec-gpio";

       cec-gpios = <&gpio 7 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;

       hpd-gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;

};

Documentation/devicetree/bindings/media/exynos5-gsc.txt

+6 −3
Original line number Diff line number Diff line
@@ -3,8 +3,11 @@ 
G-Scaler is used for scaling and color space conversion on EXYNOS5 SoCs.



Required properties:

- compatible: should be "samsung,exynos5-gsc" (for Exynos 5250, 5420 and

	      5422 SoCs) or "samsung,exynos5433-gsc" (Exynos 5433)

- compatible: should be one of

	      "samsung,exynos5250-gsc"

	      "samsung,exynos5420-gsc"

	      "samsung,exynos5433-gsc"

	      "samsung,exynos5-gsc" (deprecated)

- reg: should contain G-Scaler physical address location and length.

- interrupts: should contain G-Scaler interrupt number
@@ -15,7 +18,7 @@ Optional properties: 
Example:



gsc_0:  gsc@0x13e00000 {

	compatible = "samsung,exynos5-gsc";

	compatible = "samsung,exynos5250-gsc";

	reg = <0x13e00000 0x1000>;

	interrupts = <0 85 0>;

};

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

0 → 100644
+33 −0
Original line number Diff line number Diff line 
* Sony 1/2.5-Inch 8.51Mp CMOS Digital Image Sensor



The Sony imx274 is a 1/2.5-inch CMOS active pixel digital image sensor with

an active array size of 3864H x 2202V. It is programmable through I2C

interface. The I2C address is fixed to 0x1a as per sensor data sheet.

Image data is sent through MIPI CSI-2, which is configured as 4 lanes

at 1440 Mbps.





Required Properties:

- compatible: value should be "sony,imx274" for imx274 sensor

- reg: I2C bus address of the device



Optional Properties:

- reset-gpios: Sensor reset GPIO



The imx274 device node should contain one 'port' child node with

an 'endpoint' subnode. For further reading on port node refer to

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



Example:

	sensor@1a {

		compatible = "sony,imx274";

		reg = <0x1a>;

		#address-cells = <1>;

		#size-cells = <0>;

		reset-gpios = <&gpio_sensor 0 0>;

		port {

			sensor_out: endpoint {

				remote-endpoint = <&csiss_in>;

			};

		};

	};

Documentation/devicetree/bindings/media/i2c/nokia,smia.txt

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ Optional properties 
- nokia,nvm-size: The size of the NVM, in bytes. If the size is not given,

  the NVM contents will not be read.

- reset-gpios: XSHUTDOWN GPIO

- flash-leds: See ../video-interfaces.txt

- lens-focus: See ../video-interfaces.txt





Endpoint node mandatory properties

Documentation/devicetree/bindings/media/rockchip-rga.txt

0 → 100644
+33 −0
Original line number Diff line number Diff line 
device-tree bindings for rockchip 2D raster graphic acceleration controller (RGA)



RGA is a standalone 2D raster graphic acceleration unit. It accelerates 2D

graphics operations, such as point/line drawing, image scaling, rotation,

BitBLT, alpha blending and image blur/sharpness.



Required properties:

- compatible: value should be one of the following

		"rockchip,rk3288-rga";

		"rockchip,rk3399-rga";



- interrupts: RGA interrupt specifier.



- clocks: phandle to RGA sclk/hclk/aclk clocks



- clock-names: should be "aclk", "hclk" and "sclk"



- resets: Must contain an entry for each entry in reset-names.

  See ../reset/reset.txt for details.

- reset-names: should be "core", "axi" and "ahb"



Example:

SoC-specific DT entry:

	rga: rga@ff680000 {

		compatible = "rockchip,rk3399-rga";

		reg = <0xff680000 0x10000>;

		interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru ACLK_RGA>, <&cru HCLK_RGA>, <&cru SCLK_RGA_CORE>;

		clock-names = "aclk", "hclk", "sclk";



		resets = <&cru SRST_RGA_CORE>, <&cru SRST_A_RGA>, <&cru SRST_H_RGA>;

		reset-names = "core, "axi", "ahb";

	};