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

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / dm814x.dtsi

diff --git a/arch/arm/boot/dts/dm814x.dtsi b/arch/arm/boot/dts/dm814x.dtsi
index f044abd64b7ea173140499878209b0946b1b8248..95de9f214c14a4c1e221723d52f3688ac138d13a 100644 (file)
--- a/arch/arm/boot/dts/dm814x.dtsi
+++ b/arch/arm/boot/dts/dm814x.dtsi
@@ -405,6 +405,12 @@
                                        #size-cells = <1>;
                                        ranges = <0 0 0x800>;
 
+                                       phy_gmii_sel: phy-gmii-sel {
+                                               compatible = "ti,dm814-phy-gmii-sel";
+                                               reg = <0x650 0x4>;
+                                               #phy-cells = <1>;
+                                       };
+
                                        scm_clocks: clocks {
                                                #address-cells = <1>;
                                                #size-cells = <0>;
@@ -611,17 +617,14 @@
                        cpsw_emac0: slave@4a100200 {
                                /* Filled in by U-Boot */
                                mac-address = [ 00 00 00 00 00 00 ];
+                               phys = <&phy_gmii_sel 1>;
+
                        };
 
                        cpsw_emac1: slave@4a100300 {
                                /* Filled in by U-Boot */
                                mac-address = [ 00 00 00 00 00 00 ];
-                       };
-
-                       phy_sel: cpsw-phy-sel@48140650 {
-                               compatible = "ti,am3352-cpsw-phy-sel";
-                               reg= <0x48140650 0x4>;
-                               reg-names = "gmii-sel";
+                               phys = <&phy_gmii_sel 2>;
                        };
                };