Commit 83e0f265 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

Merge git://git.linuxtv.org/media_stage into media_tree 

* git://git.linuxtv.org/media_stage

: (216 commits)
  media: v4l2-ctrls-api.c: move ctrl->is_new = 1 to the correct line
  media: Revert "media: saa7146: deprecate hexium_gemini/orion, mxb and ttpci"
  media: Revert "media: av7110: move to staging/media/deprecated/saa7146"
  media: imx-pxp: convert to regmap
  media: imx-pxp: Use non-threaded IRQ
  media: imx-pxp: Introduce pxp_read() and pxp_write() wrappers
  media: imx-pxp: Implement frame size enumeration
  media: imx-pxp: Pass pixel format value to find_format()
  media: imx-pxp: Add media controller support
  media: imx-pxp: Don't set bus_info manually in .querycap()
  media: imx-pxp: Sort headers alphabetically
  media: imx-pxp: add support for i.MX7D
  media: imx-pxp: make data_path_ctrl0 platform dependent
  media: imx-pxp: disable LUT block
  media: imx-pxp: explicitly disable unused blocks
  media: imx-pxp: extract helper function to setup data path
  media: imx-pxp: detect PXP version
  media: dt-bindings: media: fsl-pxp: convert to yaml
  media: imx-mipi-csis: Implement .init_cfg() using .set_fmt()
  media: imx-mipi-csis: Use V4L2 subdev active state
  ...

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parents 94817983 05165248

Documentation/admin-guide/media/cec.rst

+2 −2
Original line number Diff line number Diff line
@@ -340,14 +340,14 @@ and IO24. Monitoring the HPD an 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``::



	cec-gpio@7 {

	cec@7 {

		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>;

	};



	cec-gpio@8 {

	cec@8 {

		compatible = "cec-gpio";

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

		hpd-gpios = <&gpio 27 GPIO_ACTIVE_HIGH>;

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

deleted100644 → 0
+0 −42
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.



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:

  - 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 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, 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>



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/cec.txt

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
Common bindings for HDMI CEC adapters



- hdmi-phandle: phandle to the HDMI controller.



- needs-hpd: if present the CEC support is only available when the HPD

  is high. Some boards only let the CEC pin through if the HPD is high,

  for example if there is a level converter that uses the HPD to power

  up or down.

Documentation/devicetree/bindings/media/amlogic,meson-gx-ao-cec.yaml→Documentation/devicetree/bindings/media/cec/amlogic,meson-gx-ao-cec.yaml

+4 −7
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
# Copyright 2019 BayLibre, SAS

%YAML 1.2

---

$id: "http://devicetree.org/schemas/media/amlogic,meson-gx-ao-cec.yaml#"

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

$id: http://devicetree.org/schemas/media/cec/amlogic,meson-gx-ao-cec.yaml#

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



title: Amlogic Meson AO-CEC Controller
@@ -33,11 +33,8 @@ properties: 
  interrupts:

    maxItems: 1



  hdmi-phandle:

    description: phandle to the HDMI controller

    $ref: /schemas/types.yaml#/definitions/phandle



allOf:

  - $ref: cec-common.yaml#

  - if:

      properties:

        compatible:
@@ -81,7 +78,7 @@ required: 
  - clocks

  - clock-names



additionalProperties: false

unevaluatedProperties: false



examples:

  - |

Documentation/devicetree/bindings/media/cec/cec-common.yaml

0 → 100644
+28 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause

%YAML 1.2

---

$id: http://devicetree.org/schemas/media/cec/cec-common.yaml#

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



title: HDMI CEC Adapters Common Properties



maintainers:

  - Hans Verkuil <hverkuil@xs4all.nl>



properties:

  $nodename:

    pattern: "^cec(@[0-9a-f]+|-[0-9]+)?$"



  hdmi-phandle:

    $ref: /schemas/types.yaml#/definitions/phandle

    description:

      Phandle to the HDMI controller.



  needs-hpd:

    type: boolean

    description:

      The CEC support is only available when the HPD is high. Some boards only

      let the CEC pin through if the HPD is high, for example if there is a

      level converter that uses the HPD to power up or down.



additionalProperties: true