From da727f82b7356a2b28c3393cec888cf3409349cf Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski Date: Thu, 8 Dec 2022 11:31:07 +0100 Subject: media: dt-bindings: amlogic,meson-gx-ao-cec: move to cec subfolder Move amlogic,meson-gx-ao-cec.yaml bindings to cec subfolder and drop unneeded quotes. Signed-off-by: Krzysztof Kozlowski Acked-by: Neil Armstrong Acked-by: Rob Herring Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- .../bindings/media/amlogic,meson-gx-ao-cec.yaml | 95 ---------------------- .../media/cec/amlogic,meson-gx-ao-cec.yaml | 95 ++++++++++++++++++++++ MAINTAINERS | 2 +- 3 files changed, 96 insertions(+), 96 deletions(-) delete mode 100644 Documentation/devicetree/bindings/media/amlogic,meson-gx-ao-cec.yaml create mode 100644 Documentation/devicetree/bindings/media/cec/amlogic,meson-gx-ao-cec.yaml diff --git a/Documentation/devicetree/bindings/media/amlogic,meson-gx-ao-cec.yaml b/Documentation/devicetree/bindings/media/amlogic,meson-gx-ao-cec.yaml deleted file mode 100644 index 8d844f4312d1..000000000000 --- a/Documentation/devicetree/bindings/media/amlogic,meson-gx-ao-cec.yaml +++ /dev/null @@ -1,95 +0,0 @@ -# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) -# 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#" - -title: Amlogic Meson AO-CEC Controller - -maintainers: - - Neil Armstrong - -description: | - The Amlogic Meson AO-CEC module is present is Amlogic SoCs and its purpose is - to handle communication between HDMI connected devices over the CEC bus. - -properties: - compatible: - enum: - - amlogic,meson-gx-ao-cec # GXBB, GXL, GXM, G12A and SM1 AO_CEC_A module - - amlogic,meson-g12a-ao-cec # G12A AO_CEC_B module - - amlogic,meson-sm1-ao-cec # SM1 AO_CEC_B module - - reg: - maxItems: 1 - - clocks: - maxItems: 1 - - clock-names: - maxItems: 1 - - interrupts: - maxItems: 1 - - hdmi-phandle: - description: phandle to the HDMI controller - $ref: /schemas/types.yaml#/definitions/phandle - -allOf: - - if: - properties: - compatible: - contains: - enum: - - amlogic,meson-gx-ao-cec - - then: - properties: - clocks: - items: - - description: AO-CEC clock - - clock-names: - items: - - const: core - - - if: - properties: - compatible: - contains: - enum: - - amlogic,meson-g12a-ao-cec - - amlogic,meson-sm1-ao-cec - - then: - properties: - clocks: - items: - - description: AO-CEC clock generator source - - clock-names: - items: - - const: oscin - -required: - - compatible - - reg - - interrupts - - hdmi-phandle - - clocks - - clock-names - -additionalProperties: false - -examples: - - | - cec_AO: cec@100 { - compatible = "amlogic,meson-gx-ao-cec"; - reg = <0x00100 0x14>; - interrupts = <199>; - clocks = <&clkc_cec>; - clock-names = "core"; - hdmi-phandle = <&hdmi_tx>; - }; 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 new file mode 100644 index 000000000000..f65c9681a9f7 --- /dev/null +++ b/Documentation/devicetree/bindings/media/cec/amlogic,meson-gx-ao-cec.yaml @@ -0,0 +1,95 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +# Copyright 2019 BayLibre, SAS +%YAML 1.2 +--- +$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 + +maintainers: + - Neil Armstrong + +description: | + The Amlogic Meson AO-CEC module is present is Amlogic SoCs and its purpose is + to handle communication between HDMI connected devices over the CEC bus. + +properties: + compatible: + enum: + - amlogic,meson-gx-ao-cec # GXBB, GXL, GXM, G12A and SM1 AO_CEC_A module + - amlogic,meson-g12a-ao-cec # G12A AO_CEC_B module + - amlogic,meson-sm1-ao-cec # SM1 AO_CEC_B module + + reg: + maxItems: 1 + + clocks: + maxItems: 1 + + clock-names: + maxItems: 1 + + interrupts: + maxItems: 1 + + hdmi-phandle: + description: phandle to the HDMI controller + $ref: /schemas/types.yaml#/definitions/phandle + +allOf: + - if: + properties: + compatible: + contains: + enum: + - amlogic,meson-gx-ao-cec + + then: + properties: + clocks: + items: + - description: AO-CEC clock + + clock-names: + items: + - const: core + + - if: + properties: + compatible: + contains: + enum: + - amlogic,meson-g12a-ao-cec + - amlogic,meson-sm1-ao-cec + + then: + properties: + clocks: + items: + - description: AO-CEC clock generator source + + clock-names: + items: + - const: oscin + +required: + - compatible + - reg + - interrupts + - hdmi-phandle + - clocks + - clock-names + +additionalProperties: false + +examples: + - | + cec_AO: cec@100 { + compatible = "amlogic,meson-gx-ao-cec"; + reg = <0x00100 0x14>; + interrupts = <199>; + clocks = <&clkc_cec>; + clock-names = "core"; + hdmi-phandle = <&hdmi_tx>; + }; diff --git a/MAINTAINERS b/MAINTAINERS index 759ba6205117..4182beadef4b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13565,7 +13565,7 @@ L: linux-amlogic@lists.infradead.org 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 -- cgit