ARM: dts: microchip: fix faulty ohci/ehci node names

They should be named "usb@".

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20250226084938.3436-10-wsa+renesas@sang-engineering.com
[claudiu.beznea: replace at91 w/ microchip in commit title]
Signed-off-by: Claudiu Beznea <claudiu.beznea@tuxon.dev>

diff --git a/arch/arm/boot/dts/microchip/aks-cdu.dts b/arch/arm/boot/dts/microchip/aks-cdu.dts
index b65f80e1ef0552c1fc5a761062f7e628720aa908..302cb872efa1ecf08f8101ebd51a2004e27a46c6 100644 (file)
--- a/arch/arm/boot/dts/microchip/aks-cdu.dts
+++ b/arch/arm/boot/dts/microchip/aks-cdu.dts
@@ -56,7 +56,7 @@
                        };
                };
 
-               usb0: ohci@500000 {
+               usb0: usb@500000 {
                        num-ports = <2>;
                        status = "okay";
                };

diff --git a/arch/arm/boot/dts/microchip/animeo_ip.dts b/arch/arm/boot/dts/microchip/animeo_ip.dts
index 7f527622d3f24333912d0957f57d5f87281a8814..c11f4f7dac94503658efa76ede31ad73c4962570 100644 (file)
--- a/arch/arm/boot/dts/microchip/animeo_ip.dts
+++ b/arch/arm/boot/dts/microchip/animeo_ip.dts
@@ -136,7 +136,7 @@
                        };
                };
 
-               usb0: ohci@500000 {
+               usb0: usb@500000 {
                        num-ports = <2>;
                        atmel,vbus-gpio = <&pioB 15 GPIO_ACTIVE_LOW>;
                        status = "okay";

diff --git a/arch/arm/boot/dts/microchip/at91-foxg20.dts b/arch/arm/boot/dts/microchip/at91-foxg20.dts
index 9dfd5de808d18add2cfc0c04f0cfc28fc2b604f8..8e9e87665045c4b6bf5bf85deda0c6e6ffd05ed8 100644 (file)
--- a/arch/arm/boot/dts/microchip/at91-foxg20.dts
+++ b/arch/arm/boot/dts/microchip/at91-foxg20.dts
@@ -131,7 +131,7 @@
                        };
                };
 
-               usb0: ohci@500000 {
+               usb0: usb@500000 {
                        num-ports = <2>;
                        status = "okay";
                };

diff --git a/arch/arm/boot/dts/microchip/at91-qil_a9260.dts b/arch/arm/boot/dts/microchip/at91-qil_a9260.dts
index 5ccb3c139592d0db6d5e076547f174be647e614d..892dbd8dbbed308716b6ee291842f0e4099e1d6b 100644 (file)
--- a/arch/arm/boot/dts/microchip/at91-qil_a9260.dts
+++ b/arch/arm/boot/dts/microchip/at91-qil_a9260.dts
@@ -114,7 +114,7 @@
                        };
                };
 
-               usb0: ohci@500000 {
+               usb0: usb@500000 {
                        num-ports = <2>;
                        status = "okay";
                };

diff --git a/arch/arm/boot/dts/microchip/at91-sam9_l9260.dts b/arch/arm/boot/dts/microchip/at91-sam9_l9260.dts
index 2fb51b9aca2ae3f78a7c21a5c962421895e78db8..49dc1a4ccb367ef7da71a7371c8392141e2ee6fc 100644 (file)
--- a/arch/arm/boot/dts/microchip/at91-sam9_l9260.dts
+++ b/arch/arm/boot/dts/microchip/at91-sam9_l9260.dts
@@ -105,7 +105,7 @@
                        status = "okay";
                };
 
-               usb0: ohci@500000 {
+               usb0: usb@500000 {
                        status = "okay";
                };
 

diff --git a/arch/arm/boot/dts/microchip/at91-sama5d27_som1_ek.dts b/arch/arm/boot/dts/microchip/at91-sama5d27_som1_ek.dts
index f3ffb8f01d8ac3bec9aca851282dde4dea0514fa..45edf6214cf7ee86284e6541da8d53277e4bebd7 100644 (file)
--- a/arch/arm/boot/dts/microchip/at91-sama5d27_som1_ek.dts
+++ b/arch/arm/boot/dts/microchip/at91-sama5d27_som1_ek.dts
@@ -37,7 +37,7 @@
                        status = "okay";
                };
 
-               usb1: ohci@400000 {
+               usb1: usb@400000 {
                        num-ports = <3>;
                        atmel,vbus-gpio = <0 /* &pioA PIN_PD20 GPIO_ACTIVE_HIGH */
                                           &pioA PIN_PA27 GPIO_ACTIVE_HIGH
@@ -48,7 +48,7 @@
                        status = "okay";
                };
 
-               usb2: ehci@500000 {
+               usb2: usb@500000 {
                        status = "okay";
                };
 

diff --git a/arch/arm/boot/dts/microchip/at91-sama5d2_ptc_ek.dts b/arch/arm/boot/dts/microchip/at91-sama5d2_ptc_ek.dts
index e4ae60ef5f8a04115db61d6f1931382802159621..10d69f6957cfdea8220db15fee0f43e96fea84df 100644 (file)
--- a/arch/arm/boot/dts/microchip/at91-sama5d2_ptc_ek.dts
+++ b/arch/arm/boot/dts/microchip/at91-sama5d2_ptc_ek.dts
@@ -47,7 +47,7 @@
                        status = "okay";
                };
 
-               usb1: ohci@400000 {
+               usb1: usb@400000 {
                        num-ports = <3>;
                        atmel,vbus-gpio = <0
                                           &pioA PIN_PB12 GPIO_ACTIVE_HIGH
@@ -58,7 +58,7 @@
                        status = "okay";
                };
 
-               usb2: ehci@500000 {
+               usb2: usb@500000 {
                        status = "okay";
                };
 

diff --git a/arch/arm/boot/dts/microchip/at91-sama5d2_xplained.dts b/arch/arm/boot/dts/microchip/at91-sama5d2_xplained.dts
index 4bab3f25b855a1ce7e44196a7d5a60b8d81b874c..7e77a55ed41d8b96e14129967120bf01282840b0 100644 (file)
--- a/arch/arm/boot/dts/microchip/at91-sama5d2_xplained.dts
+++ b/arch/arm/boot/dts/microchip/at91-sama5d2_xplained.dts
@@ -46,7 +46,7 @@
                        status = "okay";
                };
 
-               usb1: ohci@400000 {
+               usb1: usb@400000 {
                        num-ports = <3>;
                        atmel,vbus-gpio = <0 /* &pioA PIN_PB9 GPIO_ACTIVE_HIGH */
                                           &pioA PIN_PB10 GPIO_ACTIVE_HIGH
@@ -57,7 +57,7 @@
                        status = "okay";
                };
 
-               usb2: ehci@500000 {
+               usb2: usb@500000 {
                        status = "okay";
                };
 

diff --git a/arch/arm/boot/dts/microchip/at91-sama5d3_xplained.dts b/arch/arm/boot/dts/microchip/at91-sama5d3_xplained.dts
index 5662992cf213e33ed022c973f53eb99d0227c8af..d2c43957497dc5d147282c081fd9aa10951c9969 100644 (file)
--- a/arch/arm/boot/dts/microchip/at91-sama5d3_xplained.dts
+++ b/arch/arm/boot/dts/microchip/at91-sama5d3_xplained.dts
@@ -283,7 +283,7 @@
                        status = "okay";
                };
 
-               usb1: ohci@600000 {
+               usb1: usb@600000 {
                        num-ports = <3>;
                        atmel,vbus-gpio = <0
                                           &pioE 3 GPIO_ACTIVE_LOW
@@ -294,7 +294,7 @@
                        status = "okay";
                };
 
-               usb2: ehci@700000 {
+               usb2: usb@700000 {
                        status = "okay";
                };
 

diff --git a/arch/arm/boot/dts/microchip/at91-sama5d4_ma5d4evk.dts b/arch/arm/boot/dts/microchip/at91-sama5d4_ma5d4evk.dts
index 8adf567f2f0fe1d3bc59fffa5d5cdb10ba2fe21b..b9725e4005019ff31a64170d591093dbeefb81fa 100644 (file)
--- a/arch/arm/boot/dts/microchip/at91-sama5d4_ma5d4evk.dts
+++ b/arch/arm/boot/dts/microchip/at91-sama5d4_ma5d4evk.dts
@@ -22,7 +22,7 @@
                        status = "okay";
                };
 
-               usb1: ohci@500000 {
+               usb1: usb@500000 {
                        num-ports = <3>;
                        atmel,vbus-gpio = <0
                                           &pioE 11 GPIO_ACTIVE_LOW
@@ -31,7 +31,7 @@
                        status = "okay";
                };
 
-               usb2: ehci@600000 {
+               usb2: usb@600000 {
                        status = "okay";
                };
 

diff --git a/arch/arm/boot/dts/microchip/at91-sama5d4_xplained.dts b/arch/arm/boot/dts/microchip/at91-sama5d4_xplained.dts
index 95d701d13fef665de48055e9ff8b300aee7c67b7..0ecccb9a809df6eb37e5a9c336cd5159f6b820b8 100644 (file)
--- a/arch/arm/boot/dts/microchip/at91-sama5d4_xplained.dts
+++ b/arch/arm/boot/dts/microchip/at91-sama5d4_xplained.dts
@@ -164,7 +164,7 @@
                        status = "okay";
                };
 
-               usb1: ohci@500000 {
+               usb1: usb@500000 {
                        num-ports = <3>;
                        atmel,vbus-gpio = <0
                                           &pioE 11 GPIO_ACTIVE_HIGH
@@ -175,7 +175,7 @@
                        status = "okay";
                };
 
-               usb2: ehci@600000 {
+               usb2: usb@600000 {
                        status = "okay";
                };
 

diff --git a/arch/arm/boot/dts/microchip/at91-sama5d4ek.dts b/arch/arm/boot/dts/microchip/at91-sama5d4ek.dts
index 20ac775059ca42d5a7ae66ad36dbb1be2055f768..69107d6cd26cdac9dfa6c566e7ccca7a00ce7ef7 100644 (file)
--- a/arch/arm/boot/dts/microchip/at91-sama5d4ek.dts
+++ b/arch/arm/boot/dts/microchip/at91-sama5d4ek.dts
@@ -198,7 +198,7 @@
                        status = "okay";
                };
 
-               usb1: ohci@500000 {
+               usb1: usb@500000 {
                        num-ports = <3>;
                        atmel,vbus-gpio = <0 /* &pioE 10 GPIO_ACTIVE_LOW */
                                           &pioE 11 GPIO_ACTIVE_LOW
@@ -207,7 +207,7 @@
                        status = "okay";
                };
 
-               usb2: ehci@600000 {
+               usb2: usb@600000 {
                        status = "okay";
                };
 

diff --git a/arch/arm/boot/dts/microchip/at91-vinco.dts b/arch/arm/boot/dts/microchip/at91-vinco.dts
index ecbdacf48708e658ac7da72c5b6565146b9118c7..c5fc516670666ef331cad9c5a898e10ab3d1b05c 100644 (file)
--- a/arch/arm/boot/dts/microchip/at91-vinco.dts
+++ b/arch/arm/boot/dts/microchip/at91-vinco.dts
@@ -162,7 +162,7 @@
                        status = "disabled";
                };
 
-               usb1: ohci@500000 {
+               usb1: usb@500000 {
                        num-ports = <3>;
                        atmel,vbus-gpio = <0
                                           &pioE 11 GPIO_ACTIVE_LOW
@@ -171,7 +171,7 @@
                        status = "disabled";
                };
 
-               usb2: ehci@600000 {
+               usb2: usb@600000 {
                        /* 4G Modem */
                        status = "okay";
                };

diff --git a/arch/arm/boot/dts/microchip/at91rm9200.dtsi b/arch/arm/boot/dts/microchip/at91rm9200.dtsi
index 02a838541dc35f70e4d19dca86fb363b110022d2..2a4c83d887331fcc5e75e50a39d0c85e4d506f31 100644 (file)
--- a/arch/arm/boot/dts/microchip/at91rm9200.dtsi
+++ b/arch/arm/boot/dts/microchip/at91rm9200.dtsi
@@ -702,7 +702,7 @@
                        status = "disabled";
                };
 
-               usb0: ohci@300000 {
+               usb0: usb@300000 {
                        compatible = "atmel,at91rm9200-ohci", "usb-ohci";
                        reg = <0x00300000 0x100000>;
                        interrupts = <23 IRQ_TYPE_LEVEL_HIGH 2>;

diff --git a/arch/arm/boot/dts/microchip/at91rm9200ek.dts b/arch/arm/boot/dts/microchip/at91rm9200ek.dts
index 0bf472b157a5dfc5ce591e2d947382b7c646319e..ce691c4692b9a57bc08d686a1065e12d41b21299 100644 (file)
--- a/arch/arm/boot/dts/microchip/at91rm9200ek.dts
+++ b/arch/arm/boot/dts/microchip/at91rm9200ek.dts
@@ -89,7 +89,7 @@
                        };
                };
 
-               usb0: ohci@300000 {
+               usb0: usb@300000 {
                        num-ports = <2>;
                        status = "okay";
                };

diff --git a/arch/arm/boot/dts/microchip/at91sam9260.dtsi b/arch/arm/boot/dts/microchip/at91sam9260.dtsi
index 0038183e9a531fdbe7e1e3d083d735ee10b8c6f2..ec973f07a9619b2a8fd78937dbb5f04f4103a3f0 100644 (file)
--- a/arch/arm/boot/dts/microchip/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/microchip/at91sam9260.dtsi
@@ -742,7 +742,7 @@
                        };
                };
 
-               usb0: ohci@500000 {
+               usb0: usb@500000 {
                        compatible = "atmel,at91rm9200-ohci", "usb-ohci";
                        reg = <0x00500000 0x100000>;
                        interrupts = <20 IRQ_TYPE_LEVEL_HIGH 2>;

diff --git a/arch/arm/boot/dts/microchip/at91sam9260ek.dts b/arch/arm/boot/dts/microchip/at91sam9260ek.dts
index e8e65e60564d9d8f55c87476f20cc4eabc3c7b2c..8522a210b48478d2877ca409992affa28da93e2f 100644 (file)
--- a/arch/arm/boot/dts/microchip/at91sam9260ek.dts
+++ b/arch/arm/boot/dts/microchip/at91sam9260ek.dts
@@ -131,7 +131,7 @@
                        };
                };
 
-               usb0: ohci@500000 {
+               usb0: usb@500000 {
                        num-ports = <2>;
                        status = "okay";
                };

diff --git a/arch/arm/boot/dts/microchip/at91sam9261.dtsi b/arch/arm/boot/dts/microchip/at91sam9261.dtsi
index b57a7fd67197f915a0399d8a129fc18b829cf0b1..0b556c234557a21e12d64bbf18a1bc67f2b98cf1 100644 (file)
--- a/arch/arm/boot/dts/microchip/at91sam9261.dtsi
+++ b/arch/arm/boot/dts/microchip/at91sam9261.dtsi
@@ -77,7 +77,7 @@
                #size-cells = <1>;
                ranges;
 
-               usb0: ohci@500000 {
+               usb0: usb@500000 {
                        compatible = "atmel,at91rm9200-ohci", "usb-ohci";
                        reg = <0x00500000 0x100000>;
                        interrupts = <20 IRQ_TYPE_LEVEL_HIGH 2>;

diff --git a/arch/arm/boot/dts/microchip/at91sam9261ek.dts b/arch/arm/boot/dts/microchip/at91sam9261ek.dts
index a8f523131cd67a5f19f7ec1ae69aa402083e50a1..313bc2797fde775fc2f75b4ab7eccf6dd80312f9 100644 (file)
--- a/arch/arm/boot/dts/microchip/at91sam9261ek.dts
+++ b/arch/arm/boot/dts/microchip/at91sam9261ek.dts
@@ -31,7 +31,7 @@
        };
 
        ahb {
-               usb0: ohci@500000 {
+               usb0: usb@500000 {
                        status = "okay";
                };
 

diff --git a/arch/arm/boot/dts/microchip/at91sam9263.dtsi b/arch/arm/boot/dts/microchip/at91sam9263.dtsi
index b95d4016ae9f6ff461ad5b7b35817e1e0ba13d0d..3e9e5ce7c6c884954023f2dce7722c1ecc1743dc 100644 (file)
--- a/arch/arm/boot/dts/microchip/at91sam9263.dtsi
+++ b/arch/arm/boot/dts/microchip/at91sam9263.dtsi
@@ -768,7 +768,7 @@
                        status = "disabled";
                };
 
-               usb0: ohci@a00000 {
+               usb0: usb@a00000 {
                        compatible = "atmel,at91rm9200-ohci", "usb-ohci";
                        reg = <0x00a00000 0x100000>;
                        interrupts = <29 IRQ_TYPE_LEVEL_HIGH 2>;

diff --git a/arch/arm/boot/dts/microchip/at91sam9263ek.dts b/arch/arm/boot/dts/microchip/at91sam9263ek.dts
index f25692543d71f16ba0082540f1230a46566972b7..471ea25296aa1497e0d8cc43d71ba74ddbf5011a 100644 (file)
--- a/arch/arm/boot/dts/microchip/at91sam9263ek.dts
+++ b/arch/arm/boot/dts/microchip/at91sam9263ek.dts
@@ -207,7 +207,7 @@
                        };
                };
 
-               usb0: ohci@a00000 {
+               usb0: usb@a00000 {
                        num-ports = <2>;
                        status = "okay";
                        atmel,vbus-gpio = <&pioA 24 GPIO_ACTIVE_HIGH

diff --git a/arch/arm/boot/dts/microchip/at91sam9g20ek_common.dtsi b/arch/arm/boot/dts/microchip/at91sam9g20ek_common.dtsi
index 4e7cfbbd42419e1f95d859e902c8d54b651481da..84a7287107f8d4a0ae7a590129cfad4668e98562 100644 (file)
--- a/arch/arm/boot/dts/microchip/at91sam9g20ek_common.dtsi
+++ b/arch/arm/boot/dts/microchip/at91sam9g20ek_common.dtsi
@@ -211,7 +211,7 @@
                        };
                };
 
-               usb0: ohci@500000 {
+               usb0: usb@500000 {
                        num-ports = <2>;
                        status = "okay";
                };

diff --git a/arch/arm/boot/dts/microchip/at91sam9g45.dtsi b/arch/arm/boot/dts/microchip/at91sam9g45.dtsi
index 157d306ef5c983bcad34c6a07d675525e412d24f..535e26e05e998e202efbca07d29cc177a1d526f9 100644 (file)
--- a/arch/arm/boot/dts/microchip/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/microchip/at91sam9g45.dtsi
@@ -964,7 +964,7 @@
                        status = "disabled";
                };
 
-               usb0: ohci@700000 {
+               usb0: usb@700000 {
                        compatible = "atmel,at91rm9200-ohci", "usb-ohci";
                        reg = <0x00700000 0x100000>;
                        interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
@@ -973,7 +973,7 @@
                        status = "disabled";
                };
 
-               usb1: ehci@800000 {
+               usb1: usb@800000 {
                        compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
                        reg = <0x00800000 0x100000>;
                        interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;

diff --git a/arch/arm/boot/dts/microchip/at91sam9m10g45ek.dts b/arch/arm/boot/dts/microchip/at91sam9m10g45ek.dts
index 071db4f16313de1a657bd540ea24a6be94e5ce74..2a31b2f14893447a80e26e39b057eab5e04f01c1 100644 (file)
--- a/arch/arm/boot/dts/microchip/at91sam9m10g45ek.dts
+++ b/arch/arm/boot/dts/microchip/at91sam9m10g45ek.dts
@@ -303,14 +303,14 @@
                        };
                };
 
-               usb0: ohci@700000 {
+               usb0: usb@700000 {
                        status = "okay";
                        num-ports = <2>;
                        atmel,vbus-gpio = <&pioD 1 GPIO_ACTIVE_LOW
                                           &pioD 3 GPIO_ACTIVE_LOW>;
                };
 
-               usb1: ehci@800000 {
+               usb1: usb@800000 {
                        status = "okay";
                };
        };

diff --git a/arch/arm/boot/dts/microchip/at91sam9n12.dtsi b/arch/arm/boot/dts/microchip/at91sam9n12.dtsi
index 844bd50943fcf310256aba0c78452aded79a00d7..2f930c39ce4d7945eb769a995a0d81a2cd6e11c1 100644 (file)
--- a/arch/arm/boot/dts/microchip/at91sam9n12.dtsi
+++ b/arch/arm/boot/dts/microchip/at91sam9n12.dtsi
@@ -748,7 +748,7 @@
                        };
                };
 
-               usb0: ohci@500000 {
+               usb0: usb@500000 {
                        compatible = "atmel,at91rm9200-ohci", "usb-ohci";
                        reg = <0x00500000 0x00100000>;
                        interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;

diff --git a/arch/arm/boot/dts/microchip/at91sam9n12ek.dts b/arch/arm/boot/dts/microchip/at91sam9n12ek.dts
index 643c3b2ab97e524a15f74ef4ebe6d98cdef76f4a..b06a54e8e2377919ab75bbf147e9f22165d25c71 100644 (file)
--- a/arch/arm/boot/dts/microchip/at91sam9n12ek.dts
+++ b/arch/arm/boot/dts/microchip/at91sam9n12ek.dts
@@ -180,7 +180,7 @@
                        };
                };
 
-               usb0: ohci@500000 {
+               usb0: usb@500000 {
                        num-ports = <1>;
                        atmel,vbus-gpio = <&pioB 7 GPIO_ACTIVE_LOW>;
                        status = "okay";

diff --git a/arch/arm/boot/dts/microchip/at91sam9x5.dtsi b/arch/arm/boot/dts/microchip/at91sam9x5.dtsi
index 27c1f2861cc34d7703c7bc688c14a4c7809bf7d0..17bdf1e4db012a01aefe70a8be0cce911de36ed1 100644 (file)
--- a/arch/arm/boot/dts/microchip/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/microchip/at91sam9x5.dtsi
@@ -886,7 +886,7 @@
                        };
                };
 
-               usb0: ohci@600000 {
+               usb0: usb@600000 {
                        compatible = "atmel,at91rm9200-ohci", "usb-ohci";
                        reg = <0x00600000 0x100000>;
                        interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
@@ -895,7 +895,7 @@
                        status = "disabled";
                };
 
-               usb1: ehci@700000 {
+               usb1: usb@700000 {
                        compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
                        reg = <0x00700000 0x100000>;
                        interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;

diff --git a/arch/arm/boot/dts/microchip/ethernut5.dts b/arch/arm/boot/dts/microchip/ethernut5.dts
index ad7a0850252a1fddcf25eae341705454c16687ae..52ccef31b391eac50e592d1f1103329254a946f1 100644 (file)
--- a/arch/arm/boot/dts/microchip/ethernut5.dts
+++ b/arch/arm/boot/dts/microchip/ethernut5.dts
@@ -101,7 +101,7 @@
                        };
                };
 
-               usb0: ohci@500000 {
+               usb0: usb@500000 {
                        num-ports = <2>;
                        status = "okay";
                };

diff --git a/arch/arm/boot/dts/microchip/evk-pro3.dts b/arch/arm/boot/dts/microchip/evk-pro3.dts
index 6d519d02d190ee49c2e29de8a29234def99b9763..40c5111c2f0a0e857eec14429601c392c16a11d5 100644 (file)
--- a/arch/arm/boot/dts/microchip/evk-pro3.dts
+++ b/arch/arm/boot/dts/microchip/evk-pro3.dts
@@ -45,7 +45,7 @@
                        };
                };
 
-               usb0: ohci@500000 {
+               usb0: usb@500000 {
                        num-ports = <2>;
                        status = "okay";
                };

diff --git a/arch/arm/boot/dts/microchip/mpa1600.dts b/arch/arm/boot/dts/microchip/mpa1600.dts
index 005c2758e229c36dad92f947ca91e5586284757f..2a97e2c0b8944836cac4b6b92b0321fc1c2a7b8e 100644 (file)
--- a/arch/arm/boot/dts/microchip/mpa1600.dts
+++ b/arch/arm/boot/dts/microchip/mpa1600.dts
@@ -57,7 +57,7 @@
                        };
                };
 
-               usb0: ohci@300000 {
+               usb0: usb@300000 {
                        num-ports = <1>;
                        status = "okay";
                };

diff --git a/arch/arm/boot/dts/microchip/pm9g45.dts b/arch/arm/boot/dts/microchip/pm9g45.dts
index c349fd3758a628941b35ee715c89a871f57ef1f5..2258e62f5864451ee671001af7fe538e6868f6fe 100644 (file)
--- a/arch/arm/boot/dts/microchip/pm9g45.dts
+++ b/arch/arm/boot/dts/microchip/pm9g45.dts
@@ -139,12 +139,12 @@
                        };
                };
 
-               usb0: ohci@700000 {
+               usb0: usb@700000 {
                        status = "okay";
                        num-ports = <2>;
                };
 
-               usb1: ehci@800000 {
+               usb1: usb@800000 {
                        status = "okay";
                };
        };

diff --git a/arch/arm/boot/dts/microchip/sam9x60.dtsi b/arch/arm/boot/dts/microchip/sam9x60.dtsi
index b8b2c1ddf3f1ebd2ff8639cf488b4b5378df27e8..b075865e6a7688005d471665459b3f6f1f26f7a4 100644 (file)
--- a/arch/arm/boot/dts/microchip/sam9x60.dtsi
+++ b/arch/arm/boot/dts/microchip/sam9x60.dtsi
@@ -88,7 +88,7 @@
                        status = "disabled";
                };
 
-               usb1: ohci@600000 {
+               usb1: usb@600000 {
                        compatible = "atmel,at91rm9200-ohci", "usb-ohci";
                        reg = <0x00600000 0x100000>;
                        interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
@@ -97,7 +97,7 @@
                        status = "disabled";
                };
 
-               usb2: ehci@700000 {
+               usb2: usb@700000 {
                        compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
                        reg = <0x00700000 0x100000>;
                        interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;

diff --git a/arch/arm/boot/dts/microchip/sama5d2.dtsi b/arch/arm/boot/dts/microchip/sama5d2.dtsi
index 3f99451aef832448dba7c263295df529a25a9fb9..dc22fb679333e743f0aee23b76f618ec2aa3830e 100644 (file)
--- a/arch/arm/boot/dts/microchip/sama5d2.dtsi
+++ b/arch/arm/boot/dts/microchip/sama5d2.dtsi
@@ -136,7 +136,7 @@
                        status = "disabled";
                };
 
-               usb1: ohci@400000 {
+               usb1: usb@400000 {
                        compatible = "atmel,at91rm9200-ohci", "usb-ohci";
                        reg = <0x00400000 0x100000>;
                        interrupts = <41 IRQ_TYPE_LEVEL_HIGH 2>;
@@ -145,7 +145,7 @@
                        status = "disabled";
                };
 
-               usb2: ehci@500000 {
+               usb2: usb@500000 {
                        compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
                        reg = <0x00500000 0x100000>;
                        interrupts = <41 IRQ_TYPE_LEVEL_HIGH 2>;

diff --git a/arch/arm/boot/dts/microchip/sama5d3.dtsi b/arch/arm/boot/dts/microchip/sama5d3.dtsi
index 70f380c399ce09899dca41f232da0f740269343c..e95799c17fdb0a509ee7470f5c3ee690b7c92909 100644 (file)
--- a/arch/arm/boot/dts/microchip/sama5d3.dtsi
+++ b/arch/arm/boot/dts/microchip/sama5d3.dtsi
@@ -1074,7 +1074,7 @@
                        status = "disabled";
                };
 
-               usb1: ohci@600000 {
+               usb1: usb@600000 {
                        compatible = "atmel,at91rm9200-ohci", "usb-ohci";
                        reg = <0x00600000 0x100000>;
                        interrupts = <32 IRQ_TYPE_LEVEL_HIGH 2>;
@@ -1083,7 +1083,7 @@
                        status = "disabled";
                };
 
-               usb2: ehci@700000 {
+               usb2: usb@700000 {
                        compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
                        reg = <0x00700000 0x100000>;
                        interrupts = <32 IRQ_TYPE_LEVEL_HIGH 2>;

diff --git a/arch/arm/boot/dts/microchip/sama5d3xmb.dtsi b/arch/arm/boot/dts/microchip/sama5d3xmb.dtsi
index 3652c9e2412442850bbc7e1d5b1097ec7a414a40..90da04b84b393f55e7ed2189b5e66ac3a0c51912 100644 (file)
--- a/arch/arm/boot/dts/microchip/sama5d3xmb.dtsi
+++ b/arch/arm/boot/dts/microchip/sama5d3xmb.dtsi
@@ -172,7 +172,7 @@
                        status = "okay";
                };
 
-               usb1: ohci@600000 {
+               usb1: usb@600000 {
                        num-ports = <3>;
                        atmel,vbus-gpio = <&pioD 25 GPIO_ACTIVE_HIGH
                                           &pioD 26 GPIO_ACTIVE_LOW
@@ -181,7 +181,7 @@
                        status = "okay";
                };
 
-               usb2: ehci@700000 {
+               usb2: usb@700000 {
                        status = "okay";
                };
        };

diff --git a/arch/arm/boot/dts/microchip/sama5d4.dtsi b/arch/arm/boot/dts/microchip/sama5d4.dtsi
index 355132628604ef18c74370a414a63471210fdd43..59a7d557c7cb2e218a31d7e9906dd77061359b84 100644 (file)
--- a/arch/arm/boot/dts/microchip/sama5d4.dtsi
+++ b/arch/arm/boot/dts/microchip/sama5d4.dtsi
@@ -119,7 +119,7 @@
                        status = "disabled";
                };
 
-               usb1: ohci@500000 {
+               usb1: usb@500000 {
                        compatible = "atmel,at91rm9200-ohci", "usb-ohci";
                        reg = <0x00500000 0x100000>;
                        interrupts = <46 IRQ_TYPE_LEVEL_HIGH 2>;
@@ -128,7 +128,7 @@
                        status = "disabled";
                };
 
-               usb2: ehci@600000 {
+               usb2: usb@600000 {
                        compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
                        reg = <0x00600000 0x100000>;
                        interrupts = <46 IRQ_TYPE_LEVEL_HIGH 2>;

diff --git a/arch/arm/boot/dts/microchip/usb_a9260_common.dtsi b/arch/arm/boot/dts/microchip/usb_a9260_common.dtsi
index ae369ff042671cc16711bd9e2c158e1a45f6e9db..8c3530638c6d70dc58ab1780ab12463e3ac504d0 100644 (file)
--- a/arch/arm/boot/dts/microchip/usb_a9260_common.dtsi
+++ b/arch/arm/boot/dts/microchip/usb_a9260_common.dtsi
@@ -111,7 +111,7 @@
                        };
                };
 
-               usb0: ohci@500000 {
+               usb0: usb@500000 {
                        num-ports = <2>;
                        status = "okay";
                };

diff --git a/arch/arm/boot/dts/microchip/usb_a9263.dts b/arch/arm/boot/dts/microchip/usb_a9263.dts
index bc85d8aaf378acc49c861ecb84b034747a679a69..60d7936dc56274c42aadaa0bf2a006b60f654dbe 100644 (file)
--- a/arch/arm/boot/dts/microchip/usb_a9263.dts
+++ b/arch/arm/boot/dts/microchip/usb_a9263.dts
@@ -139,7 +139,7 @@
                        };
                };
 
-               usb0: ohci@a00000 {
+               usb0: usb@a00000 {
                        num-ports = <2>;
                        status = "okay";
                };