Commit 71f3a82f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull media updates from Mauro Carvalho Chehab:

 - new Socionext MN88443x ISDB-S/T demodulator driver: mn88443x

 - new sensor drivers: ak7375, ov2680 and rj54n1cb0c

 - an old soc-camera sensor driver converted to the V4L2 framework:
   mt9v111

 - a new Voice-Coil Motor (VCM) driver: dw9807-vcm

 - some cleanups at cx25821, removing legacy unused code

 - some improvements at ddbridge driver

 - new platform driver: vicodec

 - some DVB API cleanups, removing ioctls and compat code for old
   out-of-tree drivers that were never merged upstream

 - improvements at DVB core to support frontents that support both
   Satellite and non-satellite delivery systems

 - got rid of the unused VIDIOC_RESERVED V4L2 ioctl

 - some cleanups/improvements at gl861 ISDB driver

 - several improvements on ov772x, ov7670 and ov5640, imx274, ov5645,
   and smiapp sensor drivers

 - fixes at em28xx to support dual TS devices

 - some cleanups at V4L2/VB2 locking logic

 - some API improvements at media controller

 - some cec core and drivers improvements

 - some uvcvideo improvements

 - some improvements at platform drivers: stm32-dcmi, rcar-vin, coda,
   reneseas-ceu, imx, vsp1, venus, camss

 - lots of other cleanups and fixes

* tag 'media/v4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (406 commits)
  Revert "media: vivid: shut up warnings due to a non-trivial logic"
  siano: get rid of an unused return code for debugfs register
  media: isp: fix a warning about a wrong struct initializer
  media: radio-wl1273: fix return code for the polling routine
  media: s3c-camif: fix return code for the polling routine
  media: saa7164: fix return codes for the polling routine
  media: exynos-gsc: fix return code if mutex was interrupted
  media: mt9v111: Fix build error with no VIDEO_V4L2_SUBDEV_API
  media: xc4000: get rid of uneeded casts
  media: drxj: get rid of uneeded casts
  media: tuner-xc2028: don't use casts for printing sizes
  media: cleanup fall-through comments
  media: vivid: shut up warnings due to a non-trivial logic
  media: rtl28xxu: be sure that it won't go past the array size
  media: mt9v111: avoid going past the buffer
  media: vsp1_dl: add a description for cmdpool field
  media: sta2x11: add a missing parameter description
  media: v4l2-mem2mem: add descriptions to MC fields
  media: i2c: fix warning in Aptina MT9V111
  media: imx: shut up a false positive warning
  ...
parents 54dbe75b da2048b7

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

+14 −8
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 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.



Please note: the maximum voltage for the CEC line is 3.63V, for the HPD

line it is 5.3V. So you may need some sort of level conversion circuitry

Please note: the maximum voltage for the CEC line is 3.63V, for the HPD and

5V lines it is 5.3V. So you may need some sort of level conversion circuitry

when connecting them to a GPIO line.



Required properties:
@@ -19,13 +19,18 @@ 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:

the following property is optional and can be used for debugging HPD changes:



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



This property is optional and can be used for debugging changes on the 5V line:



  - v5-gpios: gpio that the 5V 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 (some level shifter is needed for this!):

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

connected to pin 11 aka BCM17 and the 5V line is connected to pin

15 aka BCM22 (some level shifter is needed for the HPD and 5V lines!):



#include <dt-bindings/gpio/gpio.h>
@@ -33,4 +38,5 @@ cec-gpio { 
	compatible = "cec-gpio";

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

	hpd-gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;

	v5-gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;

};

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

0 → 100644
+8 −0
Original line number Diff line number Diff line 
Asahi Kasei Microdevices AK7375 voice coil lens driver



AK7375 is a camera voice coil lens.



Mandatory properties:



- compatible: "asahi-kasei,ak7375"

- reg: I2C slave address

Documentation/devicetree/bindings/media/i2c/aptina,mt9v111.txt

0 → 100644
+46 −0
Original line number Diff line number Diff line 
* Aptina MT9V111 CMOS sensor

----------------------------



The Aptina MT9V111 is a 1/4-Inch VGA-format digital image sensor with a core

based on Aptina MT9V011 sensor and an integrated Image Flow Processor (IFP).



The sensor has an active pixel array of 640x480 pixels and can output a number

of image resolution and formats controllable through a simple two-wires

interface.



Required properties:

--------------------



- compatible: shall be "aptina,mt9v111".

- clocks: reference to the system clock input provider.



Optional properties:

--------------------



- enable-gpios: output enable signal, pin name "OE#". Active low.

- standby-gpios: low power state control signal, pin name "STANDBY".

  Active high.

- reset-gpios: chip reset signal, pin name "RESET#". Active low.



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@48 {

                        compatible = "aptina,mt9v111";

                        reg = <0x48>;



                        clocks = <&camera_clk>;



                        port {

                                mt9v111_out: endpoint {

                                        remote-endpoint = <&ceu_in>;

                                };

                        };

                };

        };

Documentation/devicetree/bindings/media/i2c/dongwoon,dw9807.txt

0 → 100644
+9 −0
Original line number Diff line number Diff line 
Dongwoon Anatech DW9807 voice coil lens driver



DW9807 is a 10-bit DAC with current sink capability. It is intended for

controlling voice coil lenses.



Mandatory properties:



- compatible: "dongwoon,dw9807-vcm"

- reg: I2C slave address

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

+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,9 @@ Optional properties 
- reset-gpios: XSHUTDOWN GPIO

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

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

- rotation: Integer property; valid values are 0 (sensor mounted upright)

	    and 180 (sensor mounted upside down). See

	    ../video-interfaces.txt .





Endpoint node mandatory properties

CRA Git | Maintained and supported by SUSTech CRA and CCSE