ARM: mvebu: add Device Tree description of xHCI controllers on Armada 38x

The Marvell Armada 38x SoCs contains two xHCI controllers. This commit
adds the Device Tree description of those interfaces at the SoC level,
and also enables the two USB3 ports on the Armada 385 DB platform and
one USB3 port on the Armada 385 RD platform.

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Link: https://lkml.kernel.org/r/1400149062-32661-15-git-send-email-gregory.clement@free-electrons.com
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

diff --git a/arch/arm/boot/dts/armada-385-db.dts b/arch/arm/boot/dts/armada-385-db.dts
index 7fcbc0d2a85ff868329058c9eab96ba518f7b073..451600c5855192cebc78711ed6e446a36fee3e0b 100644 (file)
--- a/arch/arm/boot/dts/armada-385-db.dts
+++ b/arch/arm/boot/dts/armada-385-db.dts
@@ -116,6 +116,14 @@ sdhci@d8000 {
                                bus-width = <8>;
                                status = "okay";
                        };
+
+                       usb3@f0000 {
+                               status = "okay";
+                       };
+
+                       usb3@f8000 {
+                               status = "okay";
+                       };
                };
 
                pcie-controller {

diff --git a/arch/arm/boot/dts/armada-385-rd.dts b/arch/arm/boot/dts/armada-385-rd.dts
index 4b39bed4ed07d11e4e1b70613a782b74694b8650..40893255a3f0edad962ab006e6e11b716fa9a019 100644 (file)
--- a/arch/arm/boot/dts/armada-385-rd.dts
+++ b/arch/arm/boot/dts/armada-385-rd.dts
@@ -76,6 +76,10 @@ phy1: ethernet-phy@1 {
                                        reg = <1>;
                                };
                        };
+
+                       usb3@f0000 {
+                               status = "okay";
+                       };
                };
 
                pcie-controller {

diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi
index cd60738e912e16e4bbf4efb6dc670f2c8b7335fb..476831cfa9032d2d364cb4ee82efd82fd1534578 100644 (file)
--- a/arch/arm/boot/dts/armada-38x.dtsi
+++ b/arch/arm/boot/dts/armada-38x.dtsi
@@ -415,6 +415,22 @@ sdhci@d8000 {
                                mrvl,clk-delay-cycles = <0x1F>;
                                status = "disabled";
                        };
+
+                       usb3@f0000 {
+                               compatible = "marvell,armada-380-xhci";
+                               reg = <0xf0000 0x4000>,<0xf4000 0x4000>;
+                               interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
+                               clocks = <&gateclk 9>;
+                               status = "disabled";
+                       };
+
+                       usb3@f8000 {
+                               compatible = "marvell,armada-380-xhci";
+                               reg = <0xf8000 0x4000>,<0xfc000 0x4000>;
+                               interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
+                               clocks = <&gateclk 10>;
+                               status = "disabled";
+                       };
                };
        };