ARM: dts: am57xx-idk: switch to new cpsw switch drv

Switch all am571/2/4-idk boards to use new cpsw switch driver.
Those boards have 2 Ext. port wired and configured in dual_mac mode by
default. Hence, dual_mac mode has been preserved the same way between
legacy and new driver it's safe to switch drivers.

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

diff --git a/arch/arm/boot/dts/am571x-idk.dts b/arch/arm/boot/dts/am571x-idk.dts
index 391a92e24472741b2d9fa16ba9469dee13cf3f05..e81078c2d00d75678083558374933cd5a482db76 100644 (file)
--- a/arch/arm/boot/dts/am571x-idk.dts
+++ b/arch/arm/boot/dts/am571x-idk.dts
@@ -208,30 +208,3 @@
        pinctrl-1 = <&mmc2_pins_hs>;
        pinctrl-2 = <&mmc2_pins_ddr_rev20 &mmc2_iodelay_ddr_conf>;
 };
-
-&mac_sw {
-       pinctrl-names = "default", "sleep";
-       status = "okay";
-};
-
-&cpsw_port1 {
-       phy-handle = <&ethphy0_sw>;
-       phy-mode = "rgmii-rxid";
-       ti,dual-emac-pvid = <1>;
-};
-
-&cpsw_port2 {
-       phy-handle = <&ethphy1_sw>;
-       phy-mode = "rgmii-rxid";
-       ti,dual-emac-pvid = <2>;
-};
-
-&davinci_mdio_sw {
-       ethphy0_sw: ethernet-phy@0 {
-               reg = <0>;
-       };
-
-       ethphy1_sw: ethernet-phy@1 {
-               reg = <1>;
-       };
-};

diff --git a/arch/arm/boot/dts/am572x-idk.dts b/arch/arm/boot/dts/am572x-idk.dts
index 1a3af4b5430848881e8d32bd64735f6577c902bd..6504265f3f7ebfcfadd2c0e93254a8667b6eb74c 100644 (file)
--- a/arch/arm/boot/dts/am572x-idk.dts
+++ b/arch/arm/boot/dts/am572x-idk.dts
@@ -27,8 +27,3 @@
        pinctrl-1 = <&mmc2_pins_hs>;
        pinctrl-2 = <&mmc2_pins_ddr_rev20>;
 };
-
-&mac {
-       status = "okay";
-       dual_emac;
-};

diff --git a/arch/arm/boot/dts/am574x-idk.dts b/arch/arm/boot/dts/am574x-idk.dts
index c9275d0c62cfb86325ac5cedb02f665cdbdb25c3..37758761cd884b43821c431211b85dd24e05fd1d 100644 (file)
--- a/arch/arm/boot/dts/am574x-idk.dts
+++ b/arch/arm/boot/dts/am574x-idk.dts
@@ -36,11 +36,6 @@
        pinctrl-2 = <&mmc2_pins_default>;
 };
 
-&mac {
-       status = "okay";
-       dual_emac;
-};
-
 &m_can0 {
        status = "disabled";
 };

diff --git a/arch/arm/boot/dts/am57xx-idk-common.dtsi b/arch/arm/boot/dts/am57xx-idk-common.dtsi
index 1c77006cccd1d403b9aa58f75c90b771cc4adaf3..9fcb8944aa3eaf43181ad495e526528a902e9df7 100644 (file)
--- a/arch/arm/boot/dts/am57xx-idk-common.dtsi
+++ b/arch/arm/boot/dts/am57xx-idk-common.dtsi
@@ -448,19 +448,23 @@
        ext-clk-src;
 };
 
-&cpsw_emac0 {
+&mac_sw {
+       status = "okay";
+};
+
+&cpsw_port1 {
        phy-handle = <&ethphy0>;
        phy-mode = "rgmii-rxid";
-       dual_emac_res_vlan = <1>;
+       ti,dual-emac-pvid = <1>;
 };
 
-&cpsw_emac1 {
+&cpsw_port2 {
        phy-handle = <&ethphy1>;
        phy-mode = "rgmii-rxid";
-       dual_emac_res_vlan = <2>;
+       ti,dual-emac-pvid = <2>;
 };
 
-&davinci_mdio {
+&davinci_mdio_sw {
        ethphy0: ethernet-phy@0 {
                reg = <0>;
        };