diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-03-03 09:40:57 -0500 |
---|---|---|
committer | Gregory CLEMENT <gregory.clement@free-electrons.com> | 2015-03-04 09:02:04 -0500 |
commit | a165c3b63b6f24fdc47c270db5f8b1a48b69c1b6 (patch) | |
tree | 89b10eec44df7517565ddfe30cb5559f3f809f42 | |
parent | 2a2dbd8b411028151a8adb09db3395a95769b4bb (diff) |
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>
-rw-r--r-- | arch/arm/boot/dts/armada-388-db.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-388-gp.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-38x.dtsi | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/armada-388-db.dts b/arch/arm/boot/dts/armada-388-db.dts index 16512efcd32c..af6c74e5e7d6 100644 --- a/arch/arm/boot/dts/armada-388-db.dts +++ b/arch/arm/boot/dts/armada-388-db.dts | |||
@@ -99,7 +99,7 @@ | |||
99 | phy-mode = "rgmii-id"; | 99 | phy-mode = "rgmii-id"; |
100 | }; | 100 | }; |
101 | 101 | ||
102 | usb@50000 { | 102 | usb@58000 { |
103 | status = "ok"; | 103 | status = "ok"; |
104 | }; | 104 | }; |
105 | 105 | ||
diff --git a/arch/arm/boot/dts/armada-388-gp.dts b/arch/arm/boot/dts/armada-388-gp.dts index 590b383db323..3ff05739ac48 100644 --- a/arch/arm/boot/dts/armada-388-gp.dts +++ b/arch/arm/boot/dts/armada-388-gp.dts | |||
@@ -135,7 +135,7 @@ | |||
135 | }; | 135 | }; |
136 | 136 | ||
137 | /* CON4 */ | 137 | /* CON4 */ |
138 | usb@50000 { | 138 | usb@58000 { |
139 | vcc-supply = <®_usb2_0_vbus>; | 139 | vcc-supply = <®_usb2_0_vbus>; |
140 | status = "okay"; | 140 | status = "okay"; |
141 | }; | 141 | }; |
diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi index a7f2c7b2529c..1db118bf7a7a 100644 --- a/arch/arm/boot/dts/armada-38x.dtsi +++ b/arch/arm/boot/dts/armada-38x.dtsi | |||
@@ -435,7 +435,7 @@ | |||
435 | status = "disabled"; | 435 | status = "disabled"; |
436 | }; | 436 | }; |
437 | 437 | ||
438 | usb@50000 { | 438 | usb@58000 { |
439 | compatible = "marvell,orion-ehci"; | 439 | compatible = "marvell,orion-ehci"; |
440 | reg = <0x58000 0x500>; | 440 | reg = <0x58000 0x500>; |
441 | interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>; | 441 | interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>; |