Merge branch 'master' of git://git.denx.de/u-boot-usb

[oweals/u-boot.git] / arch / arm / dts / armada-cp110-slave.dtsi

diff --git a/arch/arm/dts/armada-cp110-slave.dtsi b/arch/arm/dts/armada-cp110-slave.dtsi
index 58763914496f8832cd13388648be10642080af5d..b426a4eb691008d89d2138a3c54cff5211020217 100644 (file)
--- a/arch/arm/dts/armada-cp110-slave.dtsi
+++ b/arch/arm/dts/armada-cp110-slave.dtsi
@@ -96,6 +96,16 @@
                                #size-cells = <0>;
                                compatible = "marvell,orion-mdio";
                                reg = <0x12a200 0x10>;
+                               device-name = "cps-mdio";
+                       };
+
+                       cps_xmdio: mdio@12a600 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               compatible = "marvell,xmdio";
+                               reg = <0x12a600 0x16>;
+                               status = "disabled";
+                               device-name = "cps-xmdio";
                        };
 
                        cps_syscon0: system-controller@440000 {
@@ -120,7 +130,7 @@
 
                        cps_pinctl: cps-pinctl@440000 {
                                compatible = "marvell,mvebu-pinctrl",
-                                            "marvell,a80x0-cp1-pinctrl";
+                                            "marvell,armada-8k-cps-pinctrl";
                                bank-name ="cp1-110";
                                reg = <0x440000 0x20>;
                                pin-count = <63>;
@@ -254,7 +264,7 @@
                                reg = <0x580000 0x1000>,        /* utmi-unit */
                                      <0x440420 0x4>,           /* usb-cfg */
                                      <0x440440 0x4>;           /* utmi-cfg */
-                               utmi-port = <UTMI_PHY_TO_USB_HOST0>;
+                               utmi-port = <UTMI_PHY_TO_USB3_HOST0>;
                                status = "disabled";
                        };
                };