ARM: dts: am335x-myirtech: switch to new cpsw switch drv

The dual_mac mode has been preserved the same way between legacy and new
driver, and one port devices works the same as 1 dual_mac port - it's safe
to switch drivers.

So, switch MYIR MYC-AM335X/MYD-AM335X to use new cpsw switch driver. Those
boards have or 2 Ext. port wired and configured in dual_mac mode by
default, or only 1 Ext. port.

Cc: Alexander Shiyan <shc_work@mail.ru>
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-myirtech-myc.dtsi b/arch/arm/boot/dts/am335x-myirtech-myc.dtsi
index 270a3d5..245c35f 100644 (file)
--- a/arch/arm/boot/dts/am335x-myirtech-myc.dtsi
+++ b/arch/arm/boot/dts/am335x-myirtech-myc.dtsi
@@ -57,16 +57,27 @@
        };
 };
 
-&cpsw_emac0 {
+&mac_sw {
+       pinctrl-names = "default", "sleep";
+       pinctrl-0 = <&eth_slave1_pins_default>;
+       pinctrl-1 = <&eth_slave1_pins_sleep>;
+       status = "okay";
+};
+
+&cpsw_port1 {
        phy-handle = <&phy0>;
        phy-mode = "rgmii-id";
+       ti,dual-emac-pvid = <1>;
+};
+
+&cpsw_port2 {
+       status = "disabled";
 };
 
-&davinci_mdio {
+&davinci_mdio_sw {
        pinctrl-names = "default", "sleep";
        pinctrl-0 = <&mdio_pins_default>;
        pinctrl-1 = <&mdio_pins_sleep>;
-       status = "okay";
 
        phy0: ethernet-phy@4 {
                reg = <4>;
@@ -137,14 +148,6 @@
        };
 };
 
-&mac {
-       pinctrl-names = "default", "sleep";
-       pinctrl-0 = <&eth_slave1_pins_default>;
-       pinctrl-1 = <&eth_slave1_pins_sleep>;
-       slaves = <1>;
-       status = "okay";
-};
-
 &rtc {
        system-power-controller;
 };

diff --git a/arch/arm/boot/dts/am335x-myirtech-myd.dts b/arch/arm/boot/dts/am335x-myirtech-myd.dts
index c996639..1479fd9 100644 (file)
--- a/arch/arm/boot/dts/am335x-myirtech-myd.dts
+++ b/arch/arm/boot/dts/am335x-myirtech-myd.dts
@@ -86,18 +86,26 @@
        };
 };
 
-&cpsw_emac1 {
+&cpsw_port2 {
+       status = "okay";
        phy-handle = <&phy1>;
        phy-mode = "rgmii-id";
+       ti,dual-emac-pvid = <2>;
 };
 
-&davinci_mdio {
+&davinci_mdio_sw {
        phy1: ethernet-phy@6 {
                reg = <6>;
                eee-broken-1000t;
        };
 };
 
+&mac_sw {
+       pinctrl-0 = <&eth_slave1_pins_default>, <&eth_slave2_pins_default>;
+       pinctrl-1 = <&eth_slave1_pins_sleep>, <&eth_slave2_pins_sleep>;
+       slaves = <2>;
+};
+
 &dcan0 {
        pinctrl-names = "default", "sleep";
        pinctrl-0 = <&dcan0_pins_default>;
@@ -194,12 +202,6 @@
        };
 };
 
-&mac {
-       pinctrl-0 = <&eth_slave1_pins_default>, <&eth_slave2_pins_default>;
-       pinctrl-1 = <&eth_slave1_pins_sleep>, <&eth_slave2_pins_sleep>;
-       slaves = <2>;
-};
-
 &mcasp0 {
        pinctrl-names = "default", "sleep";
        pinctrl-0 = <&mcasp0_pins_default>;