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 <krzysztof.kozlowski@linaro.org>
Acked-by: Neil Armstrong <neil.armstrong@linaro.org>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

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 (file)
index 8d844f4..0000000
--- 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 <neil.armstrong@linaro.org>
-
-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 (file)
index 0000000..f65c968
--- /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 <neil.armstrong@linaro.org>
+
+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 759ba62051173dbfd573820626a7b48493e0b673..4182beadef4b70a75ab8712e0eb48c62f498192e 100644 (file)
--- 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