Commit 4ea95696 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull media updates from Mauro Carvalho Chehab:

 - Removal of some old unused sensor drivers: ad9389b, m5mols, mt9m032,
   mt9t001, noon010pc30, s5k6aa, sr030pc30 and vs6624

 - New i.MX8 image sensor interface driver

 - Some new RC keymaps

 - lots of cleanups at atomisp driver to make it support standard
   features present on other webcam drivers

 - the cx18 and saa7146 now uses VB2

 - lots of cleanups and driver improvements

* tag 'media/v6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (460 commits)
  media: ov5670: Fix probe on ACPI
  media: nxp: imx8-isi: Remove 300ms sleep after enabling channel
  media: nxp: imx8-isi: Replace udelay() with fsleep()
  media: nxp: imx8-isi: Drop partial support for i.MX8QM and i.MX8QXP
  media: nxp: Add i.MX8 ISI driver
  media: dt-bindings: media: Add i.MX8 ISI DT bindings
  media: atomisp: gmin_platform: Add Lenovo Ideapad Miix 310 gmin_vars
  media: atomisp: gmin_platform: Make DMI quirks take precedence over the _DSM table
  media: atomisp: Remove struct atomisp_sub_device index field
  media: atomisp: Drop support for streaming from 2 sensors at once
  media: atomisp: Remove atomisp_try_fmt() call from atomisp_set_fmt()
  media: atomisp: Remove unused ATOM_ISP_MAX_WIDTH_TMP and ATOM_ISP_MAX_HEIGHT_TMP
  media: atomisp: Remove snr_mbus_fmt local var from atomisp_try_fmt()
  media: atomisp: Remove custom V4L2_CID_FMT_AUTO control
  media: atomisp: Remove continuous mode related code from atomisp_set_fmt()
  media: atomisp: Remove duplicate atomisp_[start|stop]_streaming() prototypes
  media: atomisp: gc0310: Switch over to ACPI powermanagement
  media: atomisp: gc0310: Use devm_kzalloc() for data struct
  media: atomisp: gc0310: Add runtime-pm support
  media: atomisp: gc0310: Delay power-on till streaming is started
  ...
parents c8cc58e2 73b41dc5

Documentation/admin-guide/media/cec.rst

+45 −34
Original line number Diff line number Diff line
@@ -55,6 +55,15 @@ Miscellaneous: 
  you can control the CEC line through this driver. This supports error

  injection as well.



- cec-gpio and Allwinner A10 (or any other driver that uses the CEC pin

  framework to drive the CEC pin directly): the CEC pin framework uses

  high-resolution timers. These timers are affected by NTP daemons that

  speed up or slow down the clock to sync with the official time. The

  chronyd server will by default increase or decrease the clock by

  1/12th. This will cause the CEC timings to go out of spec. To fix this,

  add a 'maxslewrate 40000' line to chronyd.conf. This limits the clock

  frequency change to 1/25th, which keeps the CEC timings within spec.





Utilities

=========
@@ -296,69 +305,71 @@ broadcast messages twice to reduce the chance of them being lost. Specifically 
Making a CEC debugger

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



By using a Raspberry Pi 2B/3/4 and some cheap components you can make

By using a Raspberry Pi 4B and some cheap components you can make

your own low-level CEC debugger.



Here is a picture of my setup:



https://hverkuil.home.xs4all.nl/rpi3-cec.jpg



It's a Raspberry Pi 3 together with a breadboard and some breadboard wires:



http://www.dx.com/p/diy-40p-male-to-female-male-to-male-female-to-female-dupont-line-wire-3pcs-356089#.WYLOOXWGN7I



Finally on of these HDMI female-female passthrough connectors (full soldering type 1):

The critical component is one of these HDMI female-female passthrough connectors

(full soldering type 1):



https://elabbay.myshopify.com/collections/camera/products/hdmi-af-af-v1a-hdmi-type-a-female-to-hdmi-type-a-female-pass-through-adapter-breakout-board?variant=45533926147



We've tested this and it works up to 4kp30 (297 MHz). The quality is not high

enough to pass-through 4kp60 (594 MHz).



I also added an RTC and a breakout shield:



https://www.amazon.com/Makerfire%C2%AE-Raspberry-Module-DS1307-Battery/dp/B00ZOXWHK4

The video quality is variable and certainly not enough to pass-through 4kp60

(594 MHz) video. You might be able to support 4kp30, but more likely you will

be limited to 1080p60 (148.5 MHz). But for CEC testing that is fine.



https://www.dx.com/p/raspberry-pi-gpio-expansion-board-breadboard-easy-multiplexing-board-one-to-three-with-screw-for-raspberry-pi-2-3-b-b-2729992.html#.YGRCG0MzZ7I

You need a breadboard and some breadboard wires:



These two are not needed but they make life a bit easier.

http://www.dx.com/p/diy-40p-male-to-female-male-to-male-female-to-female-dupont-line-wire-3pcs-356089#.WYLOOXWGN7I



If you want to monitor the HPD line as well, then you need one of these

level shifters:

If you want to monitor the HPD and/or 5V lines as well, then you need one of

these 5V to 3.3V level shifters:



https://www.adafruit.com/product/757



(This is just where I got these components, there are many other places you

can get similar things).



The ground pin of the HDMI connector needs to be connected to a ground

pin of the Raspberry Pi, of course.



The CEC pin of the HDMI connector needs to be connected to these pins:

CE0/IO8 and CE1/IO7 (pull-up GPIOs). The (optional) HPD pin of the HDMI

connector should be connected (via a level shifter to convert the 5V

to 3.3V) to these pins: IO17 and IO27. The (optional) 5V pin of the HDMI

connector should be connected (via a level shifter) to these pins: IO22

and IO24. Monitoring the HPD an 5V lines is not necessary, but it is helpful.

GPIO 6 and GPIO 7. The optional HPD pin of the HDMI connector should

be connected via the level shifter to these pins: GPIO 23 and GPIO 12.

The optional 5V pin of the HDMI connector should be connected via the

level shifter to these pins: GPIO 25 and GPIO 22. Monitoring the HPD and

5V lines is not necessary, but it is helpful.



This kernel patch will hook up the cec-gpio driver correctly to

e.g. ``arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts``::

This device tree addition in ``arch/arm/boot/dts/bcm2711-rpi-4-b.dts``

will hook up the cec-gpio driver correctly::



	cec@6 {

		compatible = "cec-gpio";

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

		hpd-gpios = <&gpio 23 GPIO_ACTIVE_HIGH>;

		v5-gpios = <&gpio 25 GPIO_ACTIVE_HIGH>;

	};



	cec@7 {

		compatible = "cec-gpio";

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

		hpd-gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;

		hpd-gpios = <&gpio 12 GPIO_ACTIVE_HIGH>;

		v5-gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;

	};



	cec@8 {

		compatible = "cec-gpio";

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

		hpd-gpios = <&gpio 27 GPIO_ACTIVE_HIGH>;

		v5-gpios = <&gpio 24 GPIO_ACTIVE_HIGH>;

	};

If you haven't hooked up the HPD and/or 5V lines, then just delete those

lines.



This dts change will enable two cec GPIO devices: I typically use one to

send/receive CEC commands and the other to monitor. If you monitor using

an unconfigured CEC adapter then it will use GPIO interrupts which makes

monitoring very accurate.



If you just want to monitor traffic, then a single instance is sufficient.

The minimum configuration is one HDMI female-female passthrough connector

and two female-female breadboard wires: one for connecting the HDMI ground

pin to a ground pin on the Raspberry Pi, and the other to connect the HDMI

CEC pin to GPIO 6 on the Raspberry Pi.



The documentation on how to use the error injection is here: :ref:`cec_pin_error_inj`.



``cec-ctl --monitor-pin`` will do low-level CEC bus sniffing and analysis.

Documentation/admin-guide/media/i2c-cardlist.rst

+0 −8
Original line number Diff line number Diff line
@@ -72,17 +72,13 @@ imx319 Sony IMX319 sensor 
imx334        Sony IMX334 sensor

imx355        Sony IMX355 sensor

imx412        Sony IMX412 sensor

m5mols        Fujitsu M-5MOLS 8MP sensor

mt9m001       mt9m001

mt9m032       MT9M032 camera sensor

mt9m111       mt9m111, mt9m112 and mt9m131

mt9p031       Aptina MT9P031

mt9t001       Aptina MT9T001

mt9t112       Aptina MT9T111/MT9T112

mt9v011       Micron mt9v011 sensor

mt9v032       Micron MT9V032 sensor

mt9v111       Aptina MT9V111 sensor

noon010pc30   Siliconfile NOON010PC30 sensor

ov13858       OmniVision OV13858 sensor

ov13b10       OmniVision OV13B10 sensor

ov2640        OmniVision OV2640 sensor
@@ -109,9 +105,6 @@ s5c73m3 Samsung S5C73M3 sensor 
s5k4ecgx      Samsung S5K4ECGX sensor

s5k5baf       Samsung S5K5BAF sensor

s5k6a3        Samsung S5K6A3 sensor

s5k6aa        Samsung S5K6AAFX sensor

sr030pc30     Siliconfile SR030PC30 sensor

vs6624        ST VS6624 sensor

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



Flash devices
@@ -222,7 +215,6 @@ Video encoders 
============  ==========================================================

Driver        Name

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

ad9389b       Analog Devices AD9389B encoder

adv7170       Analog Devices ADV7170 video encoder

adv7175       Analog Devices ADV7175 video encoder

adv7343       ADV7343 video encoder

Documentation/devicetree/bindings/media/allwinner,sun4i-a10-ir.yaml

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ maintainers: 
  - Maxime Ripard <mripard@kernel.org>



allOf:

  - $ref: "rc.yaml#"

  - $ref: rc.yaml#



properties:

  compatible:

Documentation/devicetree/bindings/media/allwinner,sun50i-h6-vpu-g2.yaml

+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 


%YAML 1.2

---

$id: "http://devicetree.org/schemas/media/allwinner,sun50i-h6-vpu-g2.yaml#"

$schema: "http://devicetree.org/meta-schemas/core.yaml#"

$id: http://devicetree.org/schemas/media/allwinner,sun50i-h6-vpu-g2.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Hantro G2 VPU codec implemented on Allwinner H6 SoC

Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml

+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
# Copyright 2020 BayLibre, SAS

%YAML 1.2

---

$id: "http://devicetree.org/schemas/media/amlogic,axg-ge2d.yaml#"

$schema: "http://devicetree.org/meta-schemas/core.yaml#"

$id: http://devicetree.org/schemas/media/amlogic,axg-ge2d.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Amlogic GE2D Acceleration Unit