ARM: mvebu: fix usb@ unit address on Armada 38x to match register address

On Marvell Armada 38x, the USB2 controller registers are at 0x58000,
so the corresponding Device Tree node should have a unit address of
58000, and not 50000. We were using 50000 due to an incorrect
copy/pastebin of Armada 370/XP code.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

diff --git a/arch/arm/boot/dts/armada-388-db.dts b/arch/arm/boot/dts/armada-388-db.dts
index 16512efcd32c091702a9a99c6ea93139598b8a5f..af6c74e5e7d6afd3a90a0e5812d69347b30c3591 100644 (file)
--- a/arch/arm/boot/dts/armada-388-db.dts
+++ b/arch/arm/boot/dts/armada-388-db.dts
@@ -99,7 +99,7 @@
                                phy-mode = "rgmii-id";
                        };
 
                                phy-mode = "rgmii-id";
                        };
 

-                       usb@50000 {
+                       usb@58000 {

                                status = "ok";
                        };
 
                                status = "ok";
                        };
 

diff --git a/arch/arm/boot/dts/armada-388-gp.dts b/arch/arm/boot/dts/armada-388-gp.dts
index 590b383db323a75a1041080951d32dbf27e3e9fa..3ff05739ac481fdc9fbd07f0e6926cafa165d9a7 100644 (file)
--- a/arch/arm/boot/dts/armada-388-gp.dts
+++ b/arch/arm/boot/dts/armada-388-gp.dts
@@ -135,7 +135,7 @@
                        };
 
                        /* CON4 */
                        };
 
                        /* CON4 */

-                       usb@50000 {
+                       usb@58000 {

                                vcc-supply = <&reg_usb2_0_vbus>;
                                status = "okay";
                        };
                                vcc-supply = <&reg_usb2_0_vbus>;
                                status = "okay";
                        };

diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi
index a7f2c7b2529c7ecbce38d1eb2135a5ff317f959c..1db118bf7a7a222ddbd6ca4f6ba62bef2f2aac88 100644 (file)
--- a/arch/arm/boot/dts/armada-38x.dtsi
+++ b/arch/arm/boot/dts/armada-38x.dtsi
@@ -435,7 +435,7 @@
                                status = "disabled";
                        };
 
                                status = "disabled";
                        };
 

-                       usb@50000 {
+                       usb@58000 {

                                compatible = "marvell,orion-ehci";
                                reg = <0x58000 0x500>;
                                interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>;
                                compatible = "marvell,orion-ehci";
                                reg = <0x58000 0x500>;
                                interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>;