dt-bindings: arm: mstar: Move existing MStar binding descriptions

Now there is an mstar directory move the existing MStar specific
descriptions into that directory.

Signed-off-by: Daniel Palmer <daniel@0x0f.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/Documentation/devicetree/bindings/arm/mstar.yaml b/Documentation/devicetree/bindings/arm/mstar.yaml
deleted file mode 100644 (file)
index bdce34b..0000000
--- a/Documentation/devicetree/bindings/arm/mstar.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
-%YAML 1.2
----
-$id: http://devicetree.org/schemas/arm/mstar.yaml#
-$schema: http://devicetree.org/meta-schemas/core.yaml#
-
-title: MStar platforms device tree bindings
-
-maintainers:
-  - Daniel Palmer <daniel@thingy.jp>
-
-properties:
-  $nodename:
-    const: '/'
-  compatible:
-    oneOf:
-      - description: infinity boards
-        items:
-          - enum:
-              - thingyjp,breadbee-crust # thingy.jp BreadBee Crust
-          - const: mstar,infinity
-
-      - description: infinity3 boards
-        items:
-          - enum:
-              - thingyjp,breadbee # thingy.jp BreadBee
-          - const: mstar,infinity3
-
-      - description: mercury5 boards
-        items:
-          - enum:
-              - 70mai,midrived08 # 70mai midrive d08
-          - const: mstar,mercury5

diff --git a/Documentation/devicetree/bindings/arm/mstar/mstar,l3bridge.yaml b/Documentation/devicetree/bindings/arm/mstar/mstar,l3bridge.yaml
new file mode 100644 (file)
index 0000000..6816bd6
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/mstar/mstar,l3bridge.yaml
@@ -0,0 +1,44 @@
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+# Copyright 2020 thingy.jp.
+%YAML 1.2
+---
+$id: "http://devicetree.org/schemas/arm/mstar/mstar,l3bridge.yaml#"
+$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+
+title: MStar/SigmaStar Armv7 SoC l3bridge
+
+maintainers:
+  - Daniel Palmer <daniel@thingy.jp>
+
+description: |
+  MStar/SigmaStar's Armv7 SoCs have a pipeline in the interface
+  between the CPU and memory. This means that before DMA capable
+  devices are allowed to run the pipeline must be flushed to ensure
+  everything is in memory.
+
+  The l3bridge region contains registers that allow such a flush
+  to be triggered.
+
+  This node is used by the platform code to find where the registers
+  are and install a barrier that triggers the required pipeline flush.
+
+properties:
+  compatible:
+    items:
+      - const: mstar,l3bridge
+
+  reg:
+    maxItems: 1
+
+required:
+  - compatible
+  - reg
+
+additionalProperties: false
+
+examples:
+  - |
+    l3bridge: l3bridge@1f204400 {
+        compatible = "mstar,l3bridge";
+        reg = <0x1f204400 0x200>;
+    };

diff --git a/Documentation/devicetree/bindings/arm/mstar/mstar.yaml b/Documentation/devicetree/bindings/arm/mstar/mstar.yaml
new file mode 100644 (file)
index 0000000..c2f980b
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/mstar/mstar.yaml
@@ -0,0 +1,33 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/arm/mstar/mstar.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: MStar platforms device tree bindings
+
+maintainers:
+  - Daniel Palmer <daniel@thingy.jp>
+
+properties:
+  $nodename:
+    const: '/'
+  compatible:
+    oneOf:
+      - description: infinity boards
+        items:
+          - enum:
+              - thingyjp,breadbee-crust # thingy.jp BreadBee Crust
+          - const: mstar,infinity
+
+      - description: infinity3 boards
+        items:
+          - enum:
+              - thingyjp,breadbee # thingy.jp BreadBee
+          - const: mstar,infinity3
+
+      - description: mercury5 boards
+        items:
+          - enum:
+              - 70mai,midrived08 # 70mai midrive d08
+          - const: mstar,mercury5

diff --git a/Documentation/devicetree/bindings/misc/mstar,l3bridge.yaml b/Documentation/devicetree/bindings/misc/mstar,l3bridge.yaml
deleted file mode 100644 (file)
index cb7fd1c..0000000
--- a/Documentation/devicetree/bindings/misc/mstar,l3bridge.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
-# Copyright 2020 thingy.jp.
-%YAML 1.2
----
-$id: "http://devicetree.org/schemas/misc/mstar,l3bridge.yaml#"
-$schema: "http://devicetree.org/meta-schemas/core.yaml#"
-
-title: MStar/SigmaStar Armv7 SoC l3bridge
-
-maintainers:
-  - Daniel Palmer <daniel@thingy.jp>
-
-description: |
-  MStar/SigmaStar's Armv7 SoCs have a pipeline in the interface
-  between the CPU and memory. This means that before DMA capable
-  devices are allowed to run the pipeline must be flushed to ensure
-  everything is in memory.
-
-  The l3bridge region contains registers that allow such a flush
-  to be triggered.
-
-  This node is used by the platform code to find where the registers
-  are and install a barrier that triggers the required pipeline flush.
-
-properties:
-  compatible:
-    items:
-      - const: mstar,l3bridge
-
-  reg:
-    maxItems: 1
-
-required:
-  - compatible
-  - reg
-
-additionalProperties: false
-
-examples:
-  - |
-    l3bridge: l3bridge@1f204400 {
-        compatible = "mstar,l3bridge";
-        reg = <0x1f204400 0x200>;
-    };

diff --git a/MAINTAINERS b/MAINTAINERS
index 2de475e12d4f77f58cdd43ffc31260d2ad96d31a..f8e2683d8bff79e6895c32360ceb1365f3789699 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2139,7 +2139,6 @@ M:        Daniel Palmer <daniel@thingy.jp>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 W:     http://linux-chenxing.org/
-F:     Documentation/devicetree/bindings/arm/mstar.yaml
 F:     Documentation/devicetree/bindings/arm/mstar/*
 F:     arch/arm/boot/dts/infinity*.dtsi
 F:     arch/arm/boot/dts/mercury*.dtsi