Signed-off-by: Andrew Lunn <andrew@xxxxxxx>
---
.../devicetree/bindings/usb/ehci-orion.txt | 22 ---------
.../bindings/usb/marvell,orion-ehci.yaml | 48 +++++++++++++++++++
arch/arm/boot/dts/kirkwood-c200-v1.dts | 2 +-
arch/arm/boot/dts/kirkwood-l-50.dts | 2 +-
arch/arm/boot/dts/kirkwood-ts219.dtsi | 2 +-
5 files changed, 51 insertions(+), 25 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/usb/ehci-orion.txt
create mode 100644 Documentation/devicetree/bindings/usb/marvell,orion-ehci.yaml
diff --git a/Documentation/devicetree/bindings/usb/ehci-orion.txt b/Documentation/devicetree/bindings/usb/ehci-orion.txt
deleted file mode 100644
index 2855bae79fda..000000000000
--- a/Documentation/devicetree/bindings/usb/ehci-orion.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-* EHCI controller, Orion Marvell variants
-
-Required properties:
-- compatible: must be one of the following
- "marvell,orion-ehci"
- "marvell,armada-3700-ehci"
-- reg: physical base address of the controller and length of memory mapped
- region.
-- interrupts: The EHCI interrupt
-
-Optional properties:
-- clocks: reference to the clock
-- phys: reference to the USB PHY
-- phy-names: name of the USB PHY, should be "usb"
-
-Example:
-
- ehci@50000 {
- compatible = "marvell,orion-ehci";
- reg = <0x50000 0x1000>;
- interrupts = <19>;
- };
diff --git a/Documentation/devicetree/bindings/usb/marvell,orion-ehci.yaml b/Documentation/devicetree/bindings/usb/marvell,orion-ehci.yaml
new file mode 100644
index 000000000000..99f640711800
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/marvell,orion-ehci.yaml
@@ -0,0 +1,48 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/usb/marvell,orion-ehci.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Marvell Orion USB Controller
+
+maintainers:
+ - Andrew Lunn <andrew@xxxxxxx>
+
+properties:
+ compatible:
+ enum:
+ - marvell,orion-ehci
+ - marvell,armada-3700-ehci
+
+ reg:
+ maxItems: 1
+
+ interrupts:
+ maxItems: 1
+
+ clocks:
+ maxItems: 1
+
+ phys:
+ maxItems: 1
+
+ phy-names:
+ description: Name of the USB PHY
+ const: 'usb'
+
+required:
+ - compatible
+ - reg
+ - interrupts
+
+additionalProperties: false
+
+examples:
+ - |
+ ehci@50000 {
+ compatible = "marvell,orion-ehci";
+ reg = <0x50000 0x1000>;
+ interrupts = <19>;
+ };
+...
diff --git a/arch/arm/boot/dts/kirkwood-c200-v1.dts b/arch/arm/boot/dts/kirkwood-c200-v1.dts
index f59ff7578dfc..a38f69331284 100644
--- a/arch/arm/boot/dts/kirkwood-c200-v1.dts
+++ b/arch/arm/boot/dts/kirkwood-c200-v1.dts
@@ -170,7 +170,7 @@ &i2c0 {
status = "okay";
rtc@30 {
- compatible = "s35390a";
+ compatible = "sii,s35390a";
reg = <0x30>;
};
diff --git a/arch/arm/boot/dts/kirkwood-l-50.dts b/arch/arm/boot/dts/kirkwood-l-50.dts
index 0d81c43a6a73..b5a658b38b6d 100644
--- a/arch/arm/boot/dts/kirkwood-l-50.dts
+++ b/arch/arm/boot/dts/kirkwood-l-50.dts
@@ -86,7 +86,7 @@ gpio3: gpio-expander@21{
};
rtc@30 {
- compatible = "s35390a";
+ compatible = "sii,s35390a";
reg = <0x30>;
};
};
diff --git a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi
index 994cabcf4b51..de5b3cb516dd 100644
--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi
@@ -19,7 +19,7 @@ i2c@11000 {
clock-frequency = <400000>;
s35390a: s35390a@30 {
- compatible = "s35390a";
+ compatible = "sii,s35390a";
reg = <0x30>;
};
};
--
2.37.2
