Hi,
Changes since v1
================
1. chrontel,ch7322: fix node name to 'cec'.
2. Add ack tags.
Best regards,
Krzysztof
Krzysztof Kozlowski (9):
media: dt-bindings: amlogic,meson-gx-ao-cec: move to cec subfolder
media: dt-bindings: st,stm32-cec: move to cec subfolder
media: dt-bindings: cec: convert common CEC properties to DT schema
media: dt-bindings: amlogic,meson-gx-ao-cec: reference common CEC
properties
media: dt-bindings: chrontel,ch7322: reference common CEC properties
media: dt-bindings: samsung,s5p-cec: convert to DT schema
media: dt-bindings: cec-gpio: convert to DT schema
media: dt-bindings: nvidia,tegra-cec: convert to DT schema
media: dt-bindings: st,stih-cec: convert to DT schema
.../devicetree/bindings/media/cec-gpio.txt | 42 -----------
.../devicetree/bindings/media/cec.txt | 8 --
.../{ => cec}/amlogic,meson-gx-ao-cec.yaml | 11 +--
.../bindings/media/cec/cec-common.yaml | 28 +++++++
.../bindings/media/cec/cec-gpio.yaml | 73 +++++++++++++++++++
.../bindings/media/cec/nvidia,tegra-cec.yaml | 58 +++++++++++++++
.../bindings/media/cec/samsung,s5p-cec.yaml | 66 +++++++++++++++++
.../bindings/media/cec/st,stih-cec.yaml | 66 +++++++++++++++++
.../media/{ => cec}/st,stm32-cec.yaml | 4 +-
.../bindings/media/i2c/chrontel,ch7322.yaml | 11 ++-
.../devicetree/bindings/media/s5p-cec.txt | 36 ---------
.../devicetree/bindings/media/stih-cec.txt | 27 -------
.../devicetree/bindings/media/tegra-cec.txt | 27 -------
MAINTAINERS | 12 +--
14 files changed, 308 insertions(+), 161 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/media/cec-gpio.txt
delete mode 100644 Documentation/devicetree/bindings/media/cec.txt
rename Documentation/devicetree/bindings/media/{ => cec}/amlogic,meson-gx-ao-cec.yaml (86%)
create mode 100644 Documentation/devicetree/bindings/media/cec/cec-common.yaml
create mode 100644 Documentation/devicetree/bindings/media/cec/cec-gpio.yaml
create mode 100644 Documentation/devicetree/bindings/media/cec/nvidia,tegra-cec.yaml
create mode 100644 Documentation/devicetree/bindings/media/cec/samsung,s5p-cec.yaml
create mode 100644 Documentation/devicetree/bindings/media/cec/st,stih-cec.yaml
rename Documentation/devicetree/bindings/media/{ => cec}/st,stm32-cec.yaml (89%)
delete mode 100644 Documentation/devicetree/bindings/media/s5p-cec.txt
delete mode 100644 Documentation/devicetree/bindings/media/stih-cec.txt
delete mode 100644 Documentation/devicetree/bindings/media/tegra-cec.txt
--
2.34.1
Move amlogic,meson-gx-ao-cec.yaml bindings to cec subfolder and drop
unneeded quotes.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
Acked-by: Neil Armstrong <[email protected]>
---
.../bindings/media/{ => cec}/amlogic,meson-gx-ao-cec.yaml | 4 ++--
MAINTAINERS | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
rename Documentation/devicetree/bindings/media/{ => cec}/amlogic,meson-gx-ao-cec.yaml (93%)
diff --git a/Documentation/devicetree/bindings/media/amlogic,meson-gx-ao-cec.yaml b/Documentation/devicetree/bindings/media/cec/amlogic,meson-gx-ao-cec.yaml
similarity index 93%
rename from Documentation/devicetree/bindings/media/amlogic,meson-gx-ao-cec.yaml
rename to Documentation/devicetree/bindings/media/cec/amlogic,meson-gx-ao-cec.yaml
index 8d844f4312d1..f65c9681a9f7 100644
--- a/Documentation/devicetree/bindings/media/amlogic,meson-gx-ao-cec.yaml
+++ b/Documentation/devicetree/bindings/media/cec/amlogic,meson-gx-ao-cec.yaml
@@ -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
diff --git a/MAINTAINERS b/MAINTAINERS
index e3f3c3e53f77..07cb85cac4c3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13553,7 +13553,7 @@ L: [email protected]
S: Supported
W: http://linux-meson.com/
T: git git://linuxtv.org/media_tree.git
-F: Documentation/devicetree/bindings/media/amlogic,meson-gx-ao-cec.yaml
+F: Documentation/devicetree/bindings/media/cec/amlogic,meson-gx-ao-cec.yaml
F: drivers/media/cec/platform/meson/ao-cec-g12a.c
F: drivers/media/cec/platform/meson/ao-cec.c
--
2.34.1
Convert common HDMI CEC adapter bindings to DT schema.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
Acked-by: Hans Verkuil <[email protected]>
---
.../devicetree/bindings/media/cec.txt | 8 ------
.../bindings/media/cec/cec-common.yaml | 28 +++++++++++++++++++
MAINTAINERS | 2 +-
3 files changed, 29 insertions(+), 9 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/media/cec.txt
create mode 100644 Documentation/devicetree/bindings/media/cec/cec-common.yaml
diff --git a/Documentation/devicetree/bindings/media/cec.txt b/Documentation/devicetree/bindings/media/cec.txt
deleted file mode 100644
index 22d7aae3d3d7..000000000000
--- a/Documentation/devicetree/bindings/media/cec.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-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.
diff --git a/Documentation/devicetree/bindings/media/cec/cec-common.yaml b/Documentation/devicetree/bindings/media/cec/cec-common.yaml
new file mode 100644
index 000000000000..af6ee5f1c73f
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/cec/cec-common.yaml
@@ -0,0 +1,28 @@
+# 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 <[email protected]>
+
+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
diff --git a/MAINTAINERS b/MAINTAINERS
index 07cb85cac4c3..45402e03cda5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4832,7 +4832,7 @@ S: Supported
W: http://linuxtv.org
T: git git://linuxtv.org/media_tree.git
F: Documentation/ABI/testing/debugfs-cec-error-inj
-F: Documentation/devicetree/bindings/media/cec.txt
+F: Documentation/devicetree/bindings/media/cec/cec-common.yaml
F: Documentation/driver-api/media/cec-core.rst
F: Documentation/userspace-api/media/cec
F: drivers/media/cec/
--
2.34.1
Convert Samsung S5P HDMI CEC adapter bindings to DT schema.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
.../bindings/media/cec/samsung,s5p-cec.yaml | 66 +++++++++++++++++++
.../devicetree/bindings/media/s5p-cec.txt | 36 ----------
MAINTAINERS | 2 +-
3 files changed, 67 insertions(+), 37 deletions(-)
create mode 100644 Documentation/devicetree/bindings/media/cec/samsung,s5p-cec.yaml
delete mode 100644 Documentation/devicetree/bindings/media/s5p-cec.txt
diff --git a/Documentation/devicetree/bindings/media/cec/samsung,s5p-cec.yaml b/Documentation/devicetree/bindings/media/cec/samsung,s5p-cec.yaml
new file mode 100644
index 000000000000..016c8a77c1a6
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/cec/samsung,s5p-cec.yaml
@@ -0,0 +1,66 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/media/cec/samsung,s5p-cec.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Samsung S5PV210 and Exynos HDMI CEC
+
+maintainers:
+ - Krzysztof Kozlowski <[email protected]>
+ - Marek Szyprowski <[email protected]>
+
+allOf:
+ - $ref: cec-common.yaml#
+
+properties:
+ compatible:
+ const: samsung,s5p-cec
+
+ clocks:
+ maxItems: 1
+
+ clock-names:
+ items:
+ - const: hdmicec
+
+ interrupts:
+ maxItems: 1
+
+ samsung,syscon-phandle:
+ $ref: /schemas/types.yaml#/definitions/phandle
+ description:
+ Phandle to PMU system controller interface
+
+ reg:
+ maxItems: 1
+
+required:
+ - compatible
+ - clocks
+ - clock-names
+ - hdmi-phandle
+ - interrupts
+ - samsung,syscon-phandle
+ - reg
+
+unevaluatedProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/clock/exynos5420.h>
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+
+ cec@101b0000 {
+ compatible = "samsung,s5p-cec";
+ reg = <0x101B0000 0x200>;
+
+ clocks = <&clock CLK_HDMI_CEC>;
+ clock-names = "hdmicec";
+ interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;
+ hdmi-phandle = <&hdmi>;
+ needs-hpd;
+ pinctrl-names = "default";
+ pinctrl-0 = <&hdmi_cec>;
+ samsung,syscon-phandle = <&pmu_system_controller>;
+ };
diff --git a/Documentation/devicetree/bindings/media/s5p-cec.txt b/Documentation/devicetree/bindings/media/s5p-cec.txt
deleted file mode 100644
index e847291d4aff..000000000000
--- a/Documentation/devicetree/bindings/media/s5p-cec.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-* Samsung HDMI CEC driver
-
-The HDMI CEC module is present is Samsung SoCs and its purpose is to
-handle communication between HDMI connected devices over the CEC bus.
-
-Required properties:
- - compatible : value should be following
- "samsung,s5p-cec"
-
- - reg : Physical base address of the IP registers and length of memory
- mapped region.
-
- - interrupts : HDMI CEC interrupt number to the CPU.
- - clocks : from common clock binding: handle to HDMI CEC clock.
- - clock-names : from common clock binding: must contain "hdmicec",
- corresponding to entry in the clocks property.
- - samsung,syscon-phandle - phandle to the PMU system controller
- - hdmi-phandle - phandle to the HDMI controller, see also cec.txt.
-
-Optional:
- - needs-hpd : if present the CEC support is only available when the HPD
- is high. See cec.txt for more details.
-
-Example:
-
-hdmicec: cec@100b0000 {
- compatible = "samsung,s5p-cec";
- reg = <0x100B0000 0x200>;
- interrupts = <0 114 0>;
- clocks = <&clock CLK_HDMI_CEC>;
- clock-names = "hdmicec";
- samsung,syscon-phandle = <&pmu_system_controller>;
- hdmi-phandle = <&hdmi>;
- pinctrl-names = "default";
- pinctrl-0 = <&hdmi_cec>;
-};
diff --git a/MAINTAINERS b/MAINTAINERS
index 45402e03cda5..05acbaecef52 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2866,7 +2866,7 @@ M: Marek Szyprowski <[email protected]>
L: [email protected]
L: [email protected]
S: Maintained
-F: Documentation/devicetree/bindings/media/s5p-cec.txt
+F: Documentation/devicetree/bindings/media/cec/samsung,s5p-cec.yaml
F: drivers/media/cec/platform/s5p/
ARM/SAMSUNG S5P SERIES JPEG CODEC SUPPORT
--
2.34.1
Convert HDMI CEC GPIO bindings to DT schema.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
Acked-by: Hans Verkuil <[email protected]>
---
.../devicetree/bindings/media/cec-gpio.txt | 42 -----------
.../bindings/media/cec/cec-gpio.yaml | 73 +++++++++++++++++++
MAINTAINERS | 2 +-
3 files changed, 74 insertions(+), 43 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/media/cec-gpio.txt
create mode 100644 Documentation/devicetree/bindings/media/cec/cec-gpio.yaml
diff --git a/Documentation/devicetree/bindings/media/cec-gpio.txt b/Documentation/devicetree/bindings/media/cec-gpio.txt
deleted file mode 100644
index 47e8d73d32a3..000000000000
--- a/Documentation/devicetree/bindings/media/cec-gpio.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-* 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>;
-};
diff --git a/Documentation/devicetree/bindings/media/cec/cec-gpio.yaml b/Documentation/devicetree/bindings/media/cec/cec-gpio.yaml
new file mode 100644
index 000000000000..19169d58316a
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/cec/cec-gpio.yaml
@@ -0,0 +1,73 @@
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/media/cec/cec-gpio.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: HDMI CEC GPIO
+
+maintainers:
+ - Hans Verkuil <[email protected]>
+
+description: |
+ 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.
+
+properties:
+ compatible:
+ const: cec-gpio
+
+ cec-gpios:
+ maxItems: 1
+ description:
+ GPIO that the CEC line is connected to. The line should be tagged as open
+ drain.
+
+ hpd-gpios:
+ maxItems: 1
+ description:
+ GPIO that the HPD line is connected to. Used for debugging HPD changes
+ when the CEC line is not associated with an HDMI receiver/transmitter.
+
+ v5-gpios:
+ maxItems: 1
+ description:
+ GPIO that the 5V line is connected to. Used for debugging changes on the
+ 5V line.
+
+required:
+ - compatible
+ - cec-gpios
+
+allOf:
+ - $ref: cec-common.yaml#
+ - if:
+ required:
+ - hdmi-phandle
+ then:
+ properties:
+ hpd-gpios: false
+
+ - if:
+ required:
+ - hpd-gpios
+ then:
+ properties:
+ hdmi-phandle: false
+
+unevaluatedProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/gpio/gpio.h>
+
+ cec {
+ 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>;
+ };
diff --git a/MAINTAINERS b/MAINTAINERS
index 05acbaecef52..197351d3bb57 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4848,7 +4848,7 @@ L: [email protected]
S: Supported
W: http://linuxtv.org
T: git git://linuxtv.org/media_tree.git
-F: Documentation/devicetree/bindings/media/cec-gpio.txt
+F: Documentation/devicetree/bindings/media/cec/cec-gpio.yaml
F: drivers/media/cec/platform/cec-gpio/
CELL BROADBAND ENGINE ARCHITECTURE
--
2.34.1
Reference common HDMI CEC adapter properties to simplify the binding and
have only one place of definition for common properties. The common CEC
binding expects also node name to be 'cec'.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
Changes since v1:
1. Fix node name to cec.
---
.../bindings/media/i2c/chrontel,ch7322.yaml | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/Documentation/devicetree/bindings/media/i2c/chrontel,ch7322.yaml b/Documentation/devicetree/bindings/media/i2c/chrontel,ch7322.yaml
index 63e5b89d2e0b..af8ada55b3f2 100644
--- a/Documentation/devicetree/bindings/media/i2c/chrontel,ch7322.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/chrontel,ch7322.yaml
@@ -13,6 +13,9 @@ description:
The Chrontel CH7322 is a discrete HDMI-CEC controller. It is
programmable through I2C and drives a single CEC line.
+allOf:
+ - $ref: /schemas/media/cec/cec-common.yaml#
+
properties:
compatible:
const: chrontel,ch7322
@@ -40,16 +43,12 @@ properties:
if in auto mode.
maxItems: 1
- # see ../cec.txt
- hdmi-phandle:
- description: phandle to the HDMI controller
-
required:
- compatible
- reg
- interrupts
-additionalProperties: false
+unevaluatedProperties: false
examples:
- |
@@ -58,7 +57,7 @@ examples:
i2c {
#address-cells = <1>;
#size-cells = <0>;
- ch7322@75 {
+ cec@75 {
compatible = "chrontel,ch7322";
reg = <0x75>;
interrupts = <47 IRQ_TYPE_EDGE_RISING>;
--
2.34.1
Move st,stm32-cec.yaml bindings to cec subfolder and drop unneeded
"bindings" in the title.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
.../devicetree/bindings/media/{ => cec}/st,stm32-cec.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename Documentation/devicetree/bindings/media/{ => cec}/st,stm32-cec.yaml (89%)
diff --git a/Documentation/devicetree/bindings/media/st,stm32-cec.yaml b/Documentation/devicetree/bindings/media/cec/st,stm32-cec.yaml
similarity index 89%
rename from Documentation/devicetree/bindings/media/st,stm32-cec.yaml
rename to Documentation/devicetree/bindings/media/cec/st,stm32-cec.yaml
index 77144cc6f7db..2314a9a14650 100644
--- a/Documentation/devicetree/bindings/media/st,stm32-cec.yaml
+++ b/Documentation/devicetree/bindings/media/cec/st,stm32-cec.yaml
@@ -1,10 +1,10 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
-$id: http://devicetree.org/schemas/media/st,stm32-cec.yaml#
+$id: http://devicetree.org/schemas/media/cec/st,stm32-cec.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#
-title: STMicroelectronics STM32 CEC bindings
+title: STMicroelectronics STM32 CEC
maintainers:
- Yannick Fertre <[email protected]>
--
2.34.1
Reference common HDMI CEC adapter properties to simplify the binding and
have only one place of definition for common properties.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
Acked-by: Neil Armstrong <[email protected]>
---
.../bindings/media/cec/amlogic,meson-gx-ao-cec.yaml | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/Documentation/devicetree/bindings/media/cec/amlogic,meson-gx-ao-cec.yaml b/Documentation/devicetree/bindings/media/cec/amlogic,meson-gx-ao-cec.yaml
index f65c9681a9f7..b1fab53418f9 100644
--- a/Documentation/devicetree/bindings/media/cec/amlogic,meson-gx-ao-cec.yaml
+++ b/Documentation/devicetree/bindings/media/cec/amlogic,meson-gx-ao-cec.yaml
@@ -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:
- |
--
2.34.1
Convert ST STIH4xx HDMI CEC bindings to DT schema.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
.../bindings/media/cec/st,stih-cec.yaml | 66 +++++++++++++++++++
.../devicetree/bindings/media/stih-cec.txt | 27 --------
MAINTAINERS | 2 +-
3 files changed, 67 insertions(+), 28 deletions(-)
create mode 100644 Documentation/devicetree/bindings/media/cec/st,stih-cec.yaml
delete mode 100644 Documentation/devicetree/bindings/media/stih-cec.txt
diff --git a/Documentation/devicetree/bindings/media/cec/st,stih-cec.yaml b/Documentation/devicetree/bindings/media/cec/st,stih-cec.yaml
new file mode 100644
index 000000000000..aeddf16ed339
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/cec/st,stih-cec.yaml
@@ -0,0 +1,66 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/media/cec/st,stih-cec.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: STMicroelectronics STIH4xx HDMI CEC
+
+maintainers:
+ - Alain Volmat <[email protected]>
+
+allOf:
+ - $ref: cec-common.yaml#
+
+properties:
+ compatible:
+ const: st,stih-cec
+
+ clocks:
+ maxItems: 1
+
+ clock-names:
+ items:
+ - const: cec-clk
+
+ interrupts:
+ maxItems: 1
+
+ interrupt-names:
+ items:
+ - const: cec-irq
+
+ resets:
+ maxItems: 1
+
+ reg:
+ maxItems: 1
+
+required:
+ - compatible
+ - clocks
+ - hdmi-phandle
+ - interrupts
+ - resets
+ - reg
+
+unevaluatedProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+ #include <dt-bindings/reset/stih407-resets.h>
+
+ cec@94a087c {
+ compatible = "st,stih-cec";
+ reg = <0x94a087c 0x64>;
+
+ clocks = <&clk_sysin>;
+ clock-names = "cec-clk";
+ hdmi-phandle = <&sti_hdmi>;
+ interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "cec-irq";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_cec0_default>;
+ resets = <&softreset STIH407_LPM_SOFTRESET>;
+ };
diff --git a/Documentation/devicetree/bindings/media/stih-cec.txt b/Documentation/devicetree/bindings/media/stih-cec.txt
deleted file mode 100644
index ece0832fdeaf..000000000000
--- a/Documentation/devicetree/bindings/media/stih-cec.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-STMicroelectronics STIH4xx HDMI CEC driver
-
-Required properties:
- - compatible : value should be "st,stih-cec"
- - reg : Physical base address of the IP registers and length of memory
- mapped region.
- - clocks : from common clock binding: handle to HDMI CEC clock
- - interrupts : HDMI CEC interrupt number to the CPU.
- - pinctrl-names: Contains only one value - "default"
- - pinctrl-0: Specifies the pin control groups used for CEC hardware.
- - resets: Reference to a reset controller
- - hdmi-phandle: Phandle to the HDMI controller, see also cec.txt.
-
-Example for STIH407:
-
-sti-cec@94a087c {
- compatible = "st,stih-cec";
- reg = <0x94a087c 0x64>;
- clocks = <&clk_sysin>;
- clock-names = "cec-clk";
- interrupts = <GIC_SPI 140 IRQ_TYPE_NONE>;
- interrupt-names = "cec-irq";
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_cec0_default>;
- resets = <&softreset STIH407_LPM_SOFTRESET>;
- hdmi-phandle = <&hdmi>;
-};
diff --git a/MAINTAINERS b/MAINTAINERS
index dee3f776be32..5bf8879b4a59 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -19924,7 +19924,7 @@ F: sound/soc/sti/
STI CEC DRIVER
M: Alain Volmat <[email protected]>
S: Maintained
-F: Documentation/devicetree/bindings/media/stih-cec.txt
+F: Documentation/devicetree/bindings/media/cec/st,stih-cec.yaml
F: drivers/media/cec/platform/sti/
STK1160 USB VIDEO CAPTURE DRIVER
--
2.34.1
Convert Nvidia Tegra HDMI CEC bindings to DT schema.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
Acked-by: Hans Verkuil <[email protected]>
---
.../bindings/media/cec/nvidia,tegra-cec.yaml | 58 +++++++++++++++++++
.../devicetree/bindings/media/tegra-cec.txt | 27 ---------
MAINTAINERS | 2 +-
3 files changed, 59 insertions(+), 28 deletions(-)
create mode 100644 Documentation/devicetree/bindings/media/cec/nvidia,tegra-cec.yaml
delete mode 100644 Documentation/devicetree/bindings/media/tegra-cec.txt
diff --git a/Documentation/devicetree/bindings/media/cec/nvidia,tegra-cec.yaml b/Documentation/devicetree/bindings/media/cec/nvidia,tegra-cec.yaml
new file mode 100644
index 000000000000..9a4025ff7fad
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/cec/nvidia,tegra-cec.yaml
@@ -0,0 +1,58 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/media/cec/nvidia,tegra-cec.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Nvidia Tegra HDMI CEC
+
+maintainers:
+ - Hans Verkuil <[email protected]>
+
+allOf:
+ - $ref: cec-common.yaml#
+
+properties:
+ compatible:
+ enum:
+ - nvidia,tegra114-cec
+ - nvidia,tegra124-cec
+ - nvidia,tegra210-cec
+
+ clocks:
+ maxItems: 1
+
+ clock-names:
+ items:
+ - const: cec
+
+ interrupts:
+ maxItems: 1
+
+ reg:
+ maxItems: 1
+
+required:
+ - compatible
+ - clocks
+ - clock-names
+ - hdmi-phandle
+ - interrupts
+ - reg
+
+unevaluatedProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/clock/tegra124-car.h>
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+
+ cec@70015000 {
+ compatible = "nvidia,tegra124-cec";
+ reg = <0x70015000 0x00001000>;
+ interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&tegra_car TEGRA124_CLK_CEC>;
+ clock-names = "cec";
+ status = "disabled";
+ hdmi-phandle = <&hdmi>;
+ };
diff --git a/Documentation/devicetree/bindings/media/tegra-cec.txt b/Documentation/devicetree/bindings/media/tegra-cec.txt
deleted file mode 100644
index c503f06f3b84..000000000000
--- a/Documentation/devicetree/bindings/media/tegra-cec.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-* Tegra HDMI CEC hardware
-
-The HDMI CEC module is present in Tegra SoCs and its purpose is to
-handle communication between HDMI connected devices over the CEC bus.
-
-Required properties:
- - compatible : value should be one of the following:
- "nvidia,tegra114-cec"
- "nvidia,tegra124-cec"
- "nvidia,tegra210-cec"
- - reg : Physical base address of the IP registers and length of memory
- mapped region.
- - interrupts : HDMI CEC interrupt number to the CPU.
- - clocks : from common clock binding: handle to HDMI CEC clock.
- - clock-names : from common clock binding: must contain "cec",
- corresponding to the entry in the clocks property.
- - hdmi-phandle : phandle to the HDMI controller, see also cec.txt.
-
-Example:
-
-cec@70015000 {
- compatible = "nvidia,tegra124-cec";
- reg = <0x0 0x70015000 0x0 0x00001000>;
- interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&tegra_car TEGRA124_CLK_CEC>;
- clock-names = "cec";
-};
diff --git a/MAINTAINERS b/MAINTAINERS
index 197351d3bb57..dee3f776be32 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2999,7 +2999,7 @@ M: Hans Verkuil <[email protected]>
L: [email protected]
L: [email protected]
S: Maintained
-F: Documentation/devicetree/bindings/media/tegra-cec.txt
+F: Documentation/devicetree/bindings/media/cec/nvidia,tegra-cec.yaml
F: drivers/media/cec/platform/tegra/
ARM/TESLA FSD SoC SUPPORT
--
2.34.1
On Mon, 05 Dec 2022 16:18:38 +0100, Krzysztof Kozlowski wrote:
> Move st,stm32-cec.yaml bindings to cec subfolder and drop unneeded
> "bindings" in the title.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> .../devicetree/bindings/media/{ => cec}/st,stm32-cec.yaml | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> rename Documentation/devicetree/bindings/media/{ => cec}/st,stm32-cec.yaml (89%)
>
Acked-by: Rob Herring <[email protected]>
On Mon, 05 Dec 2022 16:18:37 +0100, Krzysztof Kozlowski wrote:
> Move amlogic,meson-gx-ao-cec.yaml bindings to cec subfolder and drop
> unneeded quotes.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> Acked-by: Neil Armstrong <[email protected]>
> ---
> .../bindings/media/{ => cec}/amlogic,meson-gx-ao-cec.yaml | 4 ++--
> MAINTAINERS | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
> rename Documentation/devicetree/bindings/media/{ => cec}/amlogic,meson-gx-ao-cec.yaml (93%)
>
Acked-by: Rob Herring <[email protected]>
On Mon, 05 Dec 2022 16:18:42 +0100, Krzysztof Kozlowski wrote:
> Convert Samsung S5P HDMI CEC adapter bindings to DT schema.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> .../bindings/media/cec/samsung,s5p-cec.yaml | 66 +++++++++++++++++++
> .../devicetree/bindings/media/s5p-cec.txt | 36 ----------
> MAINTAINERS | 2 +-
> 3 files changed, 67 insertions(+), 37 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/media/cec/samsung,s5p-cec.yaml
> delete mode 100644 Documentation/devicetree/bindings/media/s5p-cec.txt
>
Reviewed-by: Rob Herring <[email protected]>
On Mon, 05 Dec 2022 16:18:40 +0100, Krzysztof Kozlowski wrote:
> Reference common HDMI CEC adapter properties to simplify the binding and
> have only one place of definition for common properties.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> Acked-by: Neil Armstrong <[email protected]>
> ---
> .../bindings/media/cec/amlogic,meson-gx-ao-cec.yaml | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
Reviewed-by: Rob Herring <[email protected]>
On Mon, 05 Dec 2022 16:18:44 +0100, Krzysztof Kozlowski wrote:
> Convert Nvidia Tegra HDMI CEC bindings to DT schema.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> Acked-by: Hans Verkuil <[email protected]>
> ---
> .../bindings/media/cec/nvidia,tegra-cec.yaml | 58 +++++++++++++++++++
> .../devicetree/bindings/media/tegra-cec.txt | 27 ---------
> MAINTAINERS | 2 +-
> 3 files changed, 59 insertions(+), 28 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/media/cec/nvidia,tegra-cec.yaml
> delete mode 100644 Documentation/devicetree/bindings/media/tegra-cec.txt
>
Reviewed-by: Rob Herring <[email protected]>
On Mon, 05 Dec 2022 16:18:43 +0100, Krzysztof Kozlowski wrote:
> Convert HDMI CEC GPIO bindings to DT schema.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> Acked-by: Hans Verkuil <[email protected]>
> ---
> .../devicetree/bindings/media/cec-gpio.txt | 42 -----------
> .../bindings/media/cec/cec-gpio.yaml | 73 +++++++++++++++++++
> MAINTAINERS | 2 +-
> 3 files changed, 74 insertions(+), 43 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/media/cec-gpio.txt
> create mode 100644 Documentation/devicetree/bindings/media/cec/cec-gpio.yaml
>
Reviewed-by: Rob Herring <[email protected]>
On Mon, 05 Dec 2022 16:18:41 +0100, Krzysztof Kozlowski wrote:
> Reference common HDMI CEC adapter properties to simplify the binding and
> have only one place of definition for common properties. The common CEC
> binding expects also node name to be 'cec'.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
>
> ---
>
> Changes since v1:
> 1. Fix node name to cec.
> ---
> .../bindings/media/i2c/chrontel,ch7322.yaml | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
Reviewed-by: Rob Herring <[email protected]>
On Mon, 05 Dec 2022 16:18:45 +0100, Krzysztof Kozlowski wrote:
> Convert ST STIH4xx HDMI CEC bindings to DT schema.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> .../bindings/media/cec/st,stih-cec.yaml | 66 +++++++++++++++++++
> .../devicetree/bindings/media/stih-cec.txt | 27 --------
> MAINTAINERS | 2 +-
> 3 files changed, 67 insertions(+), 28 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/media/cec/st,stih-cec.yaml
> delete mode 100644 Documentation/devicetree/bindings/media/stih-cec.txt
>
Reviewed-by: Rob Herring <[email protected]>
On Mon, 05 Dec 2022 16:18:39 +0100, Krzysztof Kozlowski wrote:
> Convert common HDMI CEC adapter bindings to DT schema.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> Acked-by: Hans Verkuil <[email protected]>
> ---
> .../devicetree/bindings/media/cec.txt | 8 ------
> .../bindings/media/cec/cec-common.yaml | 28 +++++++++++++++++++
> MAINTAINERS | 2 +-
> 3 files changed, 29 insertions(+), 9 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/media/cec.txt
> create mode 100644 Documentation/devicetree/bindings/media/cec/cec-common.yaml
>
Reviewed-by: Rob Herring <[email protected]>
On Mon, Dec 05, 2022 at 04:18:44PM +0100, Krzysztof Kozlowski wrote:
> Convert Nvidia Tegra HDMI CEC bindings to DT schema.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> Acked-by: Hans Verkuil <[email protected]>
> ---
> .../bindings/media/cec/nvidia,tegra-cec.yaml | 58 +++++++++++++++++++
> .../devicetree/bindings/media/tegra-cec.txt | 27 ---------
> MAINTAINERS | 2 +-
> 3 files changed, 59 insertions(+), 28 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/media/cec/nvidia,tegra-cec.yaml
> delete mode 100644 Documentation/devicetree/bindings/media/tegra-cec.txt
>
> diff --git a/Documentation/devicetree/bindings/media/cec/nvidia,tegra-cec.yaml b/Documentation/devicetree/bindings/media/cec/nvidia,tegra-cec.yaml
> new file mode 100644
> index 000000000000..9a4025ff7fad
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/media/cec/nvidia,tegra-cec.yaml
For consistency with other DT bindings on Tegra, it'd be good to name
this nvidia,tegra114-cec.yaml since that's the first generation where
this IP was added. Not a big deal, though.
> @@ -0,0 +1,58 @@
> +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/media/cec/nvidia,tegra-cec.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Nvidia Tegra HDMI CEC
Again, for consistency with other bindings, NVIDIA is the preferred
spelling. It's not a big deal and could be fixed up in a subsequent
patch, there are a few other cases where the alternative spelling has
been used.
The rest looks okay, so either way:
Acked-by: Thierry Reding <[email protected]>
On 06/12/2022 17:36, Thierry Reding wrote:
> On Mon, Dec 05, 2022 at 04:18:44PM +0100, Krzysztof Kozlowski wrote:
>> Convert Nvidia Tegra HDMI CEC bindings to DT schema.
>>
>> Signed-off-by: Krzysztof Kozlowski <[email protected]>
>> Acked-by: Hans Verkuil <[email protected]>
>> ---
>> .../bindings/media/cec/nvidia,tegra-cec.yaml | 58 +++++++++++++++++++
>> .../devicetree/bindings/media/tegra-cec.txt | 27 ---------
>> MAINTAINERS | 2 +-
>> 3 files changed, 59 insertions(+), 28 deletions(-)
>> create mode 100644 Documentation/devicetree/bindings/media/cec/nvidia,tegra-cec.yaml
>> delete mode 100644 Documentation/devicetree/bindings/media/tegra-cec.txt
>>
>> diff --git a/Documentation/devicetree/bindings/media/cec/nvidia,tegra-cec.yaml b/Documentation/devicetree/bindings/media/cec/nvidia,tegra-cec.yaml
>> new file mode 100644
>> index 000000000000..9a4025ff7fad
>> --- /dev/null
>> +++ b/Documentation/devicetree/bindings/media/cec/nvidia,tegra-cec.yaml
>
> For consistency with other DT bindings on Tegra, it'd be good to name
> this nvidia,tegra114-cec.yaml since that's the first generation where
> this IP was added. Not a big deal, though.
Sure, I can rename it.
>
>> @@ -0,0 +1,58 @@
>> +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
>> +%YAML 1.2
>> +---
>> +$id: http://devicetree.org/schemas/media/cec/nvidia,tegra-cec.yaml#
>> +$schema: http://devicetree.org/meta-schemas/core.yaml#
>> +
>> +title: Nvidia Tegra HDMI CEC
>
> Again, for consistency with other bindings, NVIDIA is the preferred
> spelling. It's not a big deal and could be fixed up in a subsequent
> patch, there are a few other cases where the alternative spelling has
> been used.
>
> The rest looks okay, so either way:
>
> Acked-by: Thierry Reding <[email protected]>
OK
Best regards,
Krzysztof