Merge tag 'mvebu-dt-3.16-2' of git://git.infradead.org/linux-mvebu into next/dt

Merge "mvebu DT changes for v3.16 (incremental #2)" from Jason Cooper:

 - kirkwood
    - add OpenRD boards
    - make keymile boards bootable with latest kernels

 - mvebu
    - add ehci/xhci to Armada 375/38x boards

* tag 'mvebu-dt-3.16-2' of git://git.infradead.org/linux-mvebu:
  ARM: dts: kirkwood: add kirkwood-km_fixedeth DTS file
  ARM: dts: kirkwood: add kirkwood-km_common DTSI files
  ARM: dts: kirkwood: resynch 98dx4122 dtsi
  ARM: mvebu: add Device Tree description for the EHCI controllers on Armada 375
  ARM: mvebu: add Device Tree description of the xHCI controller on Armada 375
  ARM: mvebu: add Device Tree description of the EHCI controller on Armada 38x
  ARM: mvebu: add Device Tree description of xHCI controllers on Armada 38x
  ARM: Kirkwood: DT versions of OpenRD boards

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 24 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi
index 6ee59a344089..3de364e81b52 100644
--- a/arch/arm/boot/dts/armada-38x.dtsi
+++ b/arch/arm/boot/dts/armada-38x.dtsi
@@ -312,6 +312,14 @@
                                 status = "disabled";
                         };
 
+                        usb@50000 {
+                                compatible = "marvell,orion-ehci";
+                                reg = <0x58000 0x500>;
+                                interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>;
+                                clocks = <&gateclk 18>;
+                                status = "disabled";
+                        };
+
                         xor@60800 {
                                 compatible = "marvell,orion-xor";
                                 reg = <0x60800 0x100
@@ -416,6 +424,22 @@
                                 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";
+                        };
                 };
         };