Merge tag 'u-boot-imx-20191105' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[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..2fbd7b5514ee023a1b2e34814e78a00d601e584d 100644 (file)
--- a/arch/arm/dts/armada-cp110-slave.dtsi
+++ b/arch/arm/dts/armada-cp110-slave.dtsi
@@ -96,6 +96,7 @@
                                #size-cells = <0>;
                                compatible = "marvell,orion-mdio";
                                reg = <0x12a200 0x10>;
+                               device-name = "cps-mdio";
                        };
 
                        cps_syscon0: system-controller@440000 {
@@ -120,7 +121,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 +255,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";
                        };
                };