ARM: dts: st: use correct ohci/ehci node names

They should be named "usb@".

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20250330193833.21970-10-wsa+renesas@sang-engineering.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/boot/dts/st/spear1310-evb.dts b/arch/arm/boot/dts/st/spear1310-evb.dts
index ad216571ba5797b50434131f63a4b512e2e2eab6..089bd7db55c739d6332f02d8a1863d11aa647b5b 100644 (file)
--- a/arch/arm/boot/dts/st/spear1310-evb.dts
+++ b/arch/arm/boot/dts/st/spear1310-evb.dts
@@ -205,19 +205,19 @@
                        };
                };
 
-               ehci@e4800000 {
+               usb@e4800000 {
                        status = "okay";
                };
 
-               ehci@e5800000 {
+               usb@e5800000 {
                        status = "okay";
                };
 
-               ohci@e4000000 {
+               usb@e4000000 {
                        status = "okay";
                };
 
-               ohci@e5000000 {
+               usb@e5000000 {
                        status = "okay";
                };
 

diff --git a/arch/arm/boot/dts/st/spear1340-evb.dts b/arch/arm/boot/dts/st/spear1340-evb.dts
index 9b515b21a633bc37f1800a2203be20aa5427412d..d24146c3c9e8a04d9e66037d7396e4ffe7c45d18 100644 (file)
--- a/arch/arm/boot/dts/st/spear1340-evb.dts
+++ b/arch/arm/boot/dts/st/spear1340-evb.dts
@@ -203,7 +203,7 @@
                        };
                };
 
-               ehci@e4800000 {
+               usb@e4800000 {
                        status = "okay";
                };
 
@@ -221,7 +221,7 @@
                        };
                };
 
-               ehci@e5800000 {
+               usb@e5800000 {
                        status = "okay";
                };
 
@@ -238,11 +238,11 @@
                        status = "okay";
                };
 
-               ohci@e4000000 {
+               usb@e4000000 {
                        status = "okay";
                };
 
-               ohci@e5000000 {
+               usb@e5000000 {
                        status = "okay";
                };
 

diff --git a/arch/arm/boot/dts/st/spear13xx.dtsi b/arch/arm/boot/dts/st/spear13xx.dtsi
index 3b6897084e2634fde11641eaeffb87d651ad1a97..76749992394d674a1dc796811d9aad9860c5c37b 100644 (file)
--- a/arch/arm/boot/dts/st/spear13xx.dtsi
+++ b/arch/arm/boot/dts/st/spear13xx.dtsi
@@ -174,7 +174,7 @@
                        status = "disabled";
                };
 
-               ehci@e4800000 {
+               usb@e4800000 {
                        compatible = "st,spear600-ehci", "usb-ehci";
                        reg = <0xe4800000 0x1000>;
                        interrupts = <0 64 0x4>;
@@ -182,7 +182,7 @@
                        status = "disabled";
                };
 
-               ehci@e5800000 {
+               usb@e5800000 {
                        compatible = "st,spear600-ehci", "usb-ehci";
                        reg = <0xe5800000 0x1000>;
                        interrupts = <0 66 0x4>;
@@ -190,7 +190,7 @@
                        status = "disabled";
                };
 
-               ohci@e4000000 {
+               usb@e4000000 {
                        compatible = "st,spear600-ohci", "usb-ohci";
                        reg = <0xe4000000 0x1000>;
                        interrupts = <0 65 0x4>;
@@ -198,7 +198,7 @@
                        status = "disabled";
                };
 
-               ohci@e5000000 {
+               usb@e5000000 {
                        compatible = "st,spear600-ohci", "usb-ohci";
                        reg = <0xe5000000 0x1000>;
                        interrupts = <0 67 0x4>;

diff --git a/arch/arm/boot/dts/st/spear300-evb.dts b/arch/arm/boot/dts/st/spear300-evb.dts
index 303ef29fb805c8983bcdcc0e02a8c98be6aedd12..7d4e6412d5582e43eec8f694ff078530ff395d59 100644 (file)
--- a/arch/arm/boot/dts/st/spear300-evb.dts
+++ b/arch/arm/boot/dts/st/spear300-evb.dts
@@ -119,15 +119,15 @@
                        status = "okay";
                };
 
-               ehci@e1800000 {
+               usb@e1800000 {
                        status = "okay";
                };
 
-               ohci@e1900000 {
+               usb@e1900000 {
                        status = "okay";
                };
 
-               ohci@e2100000 {
+               usb@e2100000 {
                        status = "okay";
                };
 

diff --git a/arch/arm/boot/dts/st/spear310-evb.dts b/arch/arm/boot/dts/st/spear310-evb.dts
index ea0b53036f7b479a7081b8212219cb3030bdd671..459182210825d43ad8598166465d757362862f0b 100644 (file)
--- a/arch/arm/boot/dts/st/spear310-evb.dts
+++ b/arch/arm/boot/dts/st/spear310-evb.dts
@@ -133,15 +133,15 @@
                        status = "okay";
                };
 
-               ehci@e1800000 {
+               usb@e1800000 {
                        status = "okay";
                };
 
-               ohci@e1900000 {
+               usb@e1900000 {
                        status = "okay";
                };
 
-               ohci@e2100000 {
+               usb@e2100000 {
                        status = "okay";
                };
 

diff --git a/arch/arm/boot/dts/st/spear320-evb.dts b/arch/arm/boot/dts/st/spear320-evb.dts
index 3c026d021c92445e8bfa2b896ad4402bc8ef4216..6ac53d993cf315b0381b1a2e23ae5cc663c569b2 100644 (file)
--- a/arch/arm/boot/dts/st/spear320-evb.dts
+++ b/arch/arm/boot/dts/st/spear320-evb.dts
@@ -142,15 +142,15 @@
                        status = "okay";
                };
 
-               ehci@e1800000 {
+               usb@e1800000 {
                        status = "okay";
                };
 
-               ohci@e1900000 {
+               usb@e1900000 {
                        status = "okay";
                };
 
-               ohci@e2100000 {
+               usb@e2100000 {
                        status = "okay";
                };
 

diff --git a/arch/arm/boot/dts/st/spear320-hmi.dts b/arch/arm/boot/dts/st/spear320-hmi.dts
index 721e5ee7b6803e6d306a8a1c94cc52944e336edf..8010918e5257b1c7f8ce444fea502e6da3ed7a46 100644 (file)
--- a/arch/arm/boot/dts/st/spear320-hmi.dts
+++ b/arch/arm/boot/dts/st/spear320-hmi.dts
@@ -92,7 +92,7 @@
                        status = "okay";
                };
 
-               ehci@e1800000 {
+               usb@e1800000 {
                        status = "okay";
                };
 
@@ -147,11 +147,11 @@
                        };
                };
 
-               ohci@e1900000 {
+               usb@e1900000 {
                        status = "okay";
                };
 
-               ohci@e2100000 {
+               usb@e2100000 {
                        status = "okay";
                };
 

diff --git a/arch/arm/boot/dts/st/spear3xx.dtsi b/arch/arm/boot/dts/st/spear3xx.dtsi
index cc88ebe7a60ced1725da1f3939f2fa0e462ef918..f54bb80ba28a6e8005a3b25da5f16bad58a1246b 100644 (file)
--- a/arch/arm/boot/dts/st/spear3xx.dtsi
+++ b/arch/arm/boot/dts/st/spear3xx.dtsi
@@ -73,21 +73,21 @@
                        status = "disabled";
                };
 
-               ehci@e1800000 {
+               usb@e1800000 {
                        compatible = "st,spear600-ehci", "usb-ehci";
                        reg = <0xe1800000 0x1000>;
                        interrupts = <26>;
                        status = "disabled";
                };
 
-               ohci@e1900000 {
+               usb@e1900000 {
                        compatible = "st,spear600-ohci", "usb-ohci";
                        reg = <0xe1900000 0x1000>;
                        interrupts = <25>;
                        status = "disabled";
                };
 
-               ohci@e2100000 {
+               usb@e2100000 {
                        compatible = "st,spear600-ohci", "usb-ohci";
                        reg = <0xe2100000 0x1000>;
                        interrupts = <27>;

diff --git a/arch/arm/boot/dts/st/spear600.dtsi b/arch/arm/boot/dts/st/spear600.dtsi
index 6b67c0ceaed9d2836d9b25ac922f69eb6841400f..9a93367445ca8d61c1e05b16b7bfbc2fab1e04c5 100644 (file)
--- a/arch/arm/boot/dts/st/spear600.dtsi
+++ b/arch/arm/boot/dts/st/spear600.dtsi
@@ -91,7 +91,7 @@
                        status = "disabled";
                };
 
-               ehci_usb0: ehci@e1800000 {
+               ehci_usb0: usb@e1800000 {
                        compatible = "st,spear600-ehci", "usb-ehci";
                        reg = <0xe1800000 0x1000>;
                        interrupt-parent = <&vic1>;
@@ -99,7 +99,7 @@
                        status = "disabled";
                };
 
-               ehci_usb1: ehci@e2000000 {
+               ehci_usb1: usb@e2000000 {
                        compatible = "st,spear600-ehci", "usb-ehci";
                        reg = <0xe2000000 0x1000>;
                        interrupt-parent = <&vic1>;
@@ -107,7 +107,7 @@
                        status = "disabled";
                };
 
-               ohci_usb0: ohci@e1900000 {
+               ohci_usb0: usb@e1900000 {
                        compatible = "st,spear600-ohci", "usb-ohci";
                        reg = <0xe1900000 0x1000>;
                        interrupt-parent = <&vic1>;
@@ -115,7 +115,7 @@
                        status = "disabled";
                };
 
-               ohci_usb1: ohci@e2100000 {
+               ohci_usb1: usb@e2100000 {
                        compatible = "st,spear600-ohci", "usb-ohci";
                        reg = <0xe2100000 0x1000>;
                        interrupt-parent = <&vic1>;