Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / arch / arm / boot / dts / armada-375.dtsi

diff --git a/arch/arm/boot/dts/armada-375.dtsi b/arch/arm/boot/dts/armada-375.dtsi
index 9721e55..50096d3 100644 (file)
--- a/arch/arm/boot/dts/armada-375.dtsi
+++ b/arch/arm/boot/dts/armada-375.dtsi
@@ -14,6 +14,7 @@
 #include "skeleton.dtsi"
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/phy/phy.h>
 
 #define MBUS_ID(target,attributes) (((target) << 24) | ((attributes) << 16))
 
@@ -348,6 +349,12 @@
                                #clock-cells = <1>;
                        };
 
+                       usbcluster: usb-cluster@18400 {
+                               compatible = "marvell,armada-375-usb-cluster";
+                               reg = <0x18400 0x4>;
+                               #phy-cells = <1>;
+                       };
+
                        mbusc: mbus-controller@20000 {
                                compatible = "marvell,mbus-controller";
                                reg = <0x20000 0x100>, <0x20180 0x20>;
@@ -398,6 +405,8 @@
                                reg = <0x50000 0x500>;
                                interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&gateclk 18>;
+                               phys = <&usbcluster PHY_TYPE_USB2>;
+                               phy-names = "usb";
                                status = "disabled";
                        };
 
@@ -414,6 +423,8 @@
                                reg = <0x58000 0x20000>,<0x5b880 0x80>;
                                interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&gateclk 16>;
+                               phys = <&usbcluster PHY_TYPE_USB3>;
+                               phy-names = "usb";
                                status = "disabled";
                        };