ARM: dts: am335x: switch to use phy-gmii-sel

Switch to use phy-gmii-sel PHY instead of cpsw-phy-sel.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/boot/dts/am335x-baltos-ir2110.dts b/arch/arm/boot/dts/am335x-baltos-ir2110.dts
index 75de1e723303752eedccedd24fe0da637f0d2e37..50dcf1290ac6e2a2cd1d38506fe1287d94f33d1c 100644 (file)
--- a/arch/arm/boot/dts/am335x-baltos-ir2110.dts
+++ b/arch/arm/boot/dts/am335x-baltos-ir2110.dts
@@ -72,7 +72,3 @@ &cpsw_emac1 {
        dual_emac_res_vlan = <2>;
        phy-handle = <&phy1>;
 };
-
-&phy_sel {
-       rmii-clock-ext = <1>;
-};

diff --git a/arch/arm/boot/dts/am335x-baltos-ir3220.dts b/arch/arm/boot/dts/am335x-baltos-ir3220.dts
index 1b215c425c575ffe71870acab2101715b0b62a63..f3f1abd26470c89900c5ae3fc8a0f97360e058c9 100644 (file)
--- a/arch/arm/boot/dts/am335x-baltos-ir3220.dts
+++ b/arch/arm/boot/dts/am335x-baltos-ir3220.dts
@@ -114,7 +114,3 @@ &cpsw_emac1 {
        dual_emac_res_vlan = <2>;
        phy-handle = <&phy1>;
 };
-
-&phy_sel {
-       rmii-clock-ext = <1>;
-};

diff --git a/arch/arm/boot/dts/am335x-baltos-ir5221.dts b/arch/arm/boot/dts/am335x-baltos-ir5221.dts
index 832ead864dc5617b8fc395704f069ea1030964fd..42f473f0ed77661e305684551bb09f03fba6b955 100644 (file)
--- a/arch/arm/boot/dts/am335x-baltos-ir5221.dts
+++ b/arch/arm/boot/dts/am335x-baltos-ir5221.dts
@@ -133,10 +133,6 @@ &cpsw_emac1 {
        phy-handle = <&phy1>;
 };
 
-&phy_sel {
-       rmii-clock-ext = <1>;
-};
-
 &dcan1 {
        pinctrl-names = "default";
        pinctrl-0 = <&dcan1_pins>;

diff --git a/arch/arm/boot/dts/am335x-chiliboard.dts b/arch/arm/boot/dts/am335x-chiliboard.dts
index b50d5d2e71ff7ce1cc17611e7967d8615acb149e..bffa5dce54ec9f1ff15f9848be30f1e98054368d 100644 (file)
--- a/arch/arm/boot/dts/am335x-chiliboard.dts
+++ b/arch/arm/boot/dts/am335x-chiliboard.dts
@@ -155,10 +155,6 @@ &cpsw_emac0 {
        phy-mode = "rmii";
 };
 
-&phy_sel {
-       rmii-clock-ext;
-};
-
 /* USB */
 &usb {
        status = "okay";

diff --git a/arch/arm/boot/dts/am335x-icev2.dts b/arch/arm/boot/dts/am335x-icev2.dts
index f2005ecca74fb545ced3e438eb53cb8ea5733a9b..9ac775c7107227517820b0ff302ea7c12d5c7af0 100644 (file)
--- a/arch/arm/boot/dts/am335x-icev2.dts
+++ b/arch/arm/boot/dts/am335x-icev2.dts
@@ -484,10 +484,6 @@ &mac {
        dual_emac;
 };
 
-&phy_sel {
-       rmii-clock-ext;
-};
-
 &davinci_mdio {
        pinctrl-names = "default", "sleep";
        pinctrl-0 = <&davinci_mdio_default>;

diff --git a/arch/arm/boot/dts/am335x-igep0033.dtsi b/arch/arm/boot/dts/am335x-igep0033.dtsi
index 55b4c94cfafb278a3c8f873ff0dc1ef5c64082aa..cbd22f25de9570db37c84237305ed0fa67357d44 100644 (file)
--- a/arch/arm/boot/dts/am335x-igep0033.dtsi
+++ b/arch/arm/boot/dts/am335x-igep0033.dtsi
@@ -123,10 +123,6 @@ &cpsw_emac1 {
        phy-mode = "rmii";
 };
 
-&phy_sel {
-       rmii-clock-ext;
-};
-
 &elm {
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/am335x-lxm.dts b/arch/arm/boot/dts/am335x-lxm.dts
index 481edcfaf121e16144123b3fbf0ed38699d5b770..d0e8e720a4d6b5f5d0b9a0ec8970eaeea5ef27bd 100644 (file)
--- a/arch/arm/boot/dts/am335x-lxm.dts
+++ b/arch/arm/boot/dts/am335x-lxm.dts
@@ -328,10 +328,6 @@ &cpsw_emac1 {
        dual_emac_res_vlan = <3>;
 };
 
-&phy_sel {
-       rmii-clock-ext;
-};
-
 &mac {
        pinctrl-names = "default", "sleep";
        pinctrl-0 = <&cpsw_default>;

diff --git a/arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi b/arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi
index 14f78195347552b0e07e5f9f824ac9d9bf584d30..cb5913a6983787c2925c728f73178785421888be 100644 (file)
--- a/arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi
+++ b/arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi
@@ -159,11 +159,6 @@ &cpsw_emac1 {
        status = "okay";
 };
 
-&phy_sel {
-       reg= <0x44e10650 0xf5>;
-       rmii-clock-ext;
-};
-
 &sham {
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts b/arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts
index 5a58efc0c87433b5c2cc576ef1b27ce29568e53b..e562ce40f290a71797ae3958d1111aa3699ddc32 100644 (file)
--- a/arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts
+++ b/arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts
@@ -446,11 +446,6 @@ &cpsw_emac1 {
        dual_emac_res_vlan = <2>;
 };
 
-&phy_sel {
-       reg= <0x44e10650 0xf5>;
-       rmii-clock-ext;
-};
-
 &sham {
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/am335x-phycore-som.dtsi b/arch/arm/boot/dts/am335x-phycore-som.dtsi
index 428a25e952b0c496c189f46c840d340c6e28bd30..015adb626b0369715d1a7b30548bbdf373ee1cd9 100644 (file)
--- a/arch/arm/boot/dts/am335x-phycore-som.dtsi
+++ b/arch/arm/boot/dts/am335x-phycore-som.dtsi
@@ -100,10 +100,6 @@ &mac {
        status = "okay";
 };
 
-&phy_sel {
-       rmii-clock-ext;
-};
-
 /* I2C Busses */
 &am33xx_pinmux {
        i2c0_pins: pinmux_i2c0 {

diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi
index e957370f8aecf5a6df0b44bdd6eaed57242655d3..f459ec316a22d4cd723d43dd97d3709106aacedd 100644 (file)
--- a/arch/arm/boot/dts/am33xx-l4.dtsi
+++ b/arch/arm/boot/dts/am33xx-l4.dtsi
@@ -279,12 +279,6 @@ scm: scm@0 {
                                #pinctrl-cells = <1>;
                                ranges = <0 0 0x2000>;
 
-                               phy_sel: cpsw-phy-sel@650 {
-                                       compatible = "ti,am3352-cpsw-phy-sel";
-                                       reg= <0x650 0x4>;
-                                       reg-names = "gmii-sel";
-                               };
-
                                am33xx_pinmux: pinmux@800 {
                                        compatible = "pinctrl-single";
                                        reg = <0x800 0x238>;
@@ -300,6 +294,12 @@ scm_conf: scm_conf@0 {
                                        #size-cells = <1>;
                                        ranges = <0 0 0x800>;
 
+                                       phy_gmii_sel: phy-gmii-sel {
+                                               compatible = "ti,am3352-phy-gmii-sel";
+                                               reg = <0x650 0x4>;
+                                               #phy-cells = <2>;
+                                       };
+
                                        scm_clocks: clocks {
                                                #address-cells = <1>;
                                                #size-cells = <0>;
@@ -715,7 +715,6 @@ mac: ethernet@0 {
                                interrupts = <40 41 42 43>;
                                ranges = <0 0 0x8000>;
                                syscon = <&scm_conf>;
-                               cpsw-phy-sel = <&phy_sel>;
                                status = "disabled";
 
                                davinci_mdio: mdio@1000 {
@@ -731,11 +730,13 @@ davinci_mdio: mdio@1000 {
                                cpsw_emac0: slave@200 {
                                        /* Filled in by U-Boot */
                                        mac-address = [ 00 00 00 00 00 00 ];
+                                       phys = <&phy_gmii_sel 1 1>;
                                };
 
                                cpsw_emac1: slave@300 {
                                        /* Filled in by U-Boot */
                                        mac-address = [ 00 00 00 00 00 00 ];
+                                       phys = <&phy_gmii_sel 2 1>;
                                };
                        };
                };