ARM: dts: am335x-baltos: 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 OnRISC Baltos and NetCom/Cam boards 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: Yegor Yefremov <yegorslists@googlemail.com>
Cc: Christina Quast <cquast@hanoverdisplays.com>
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 56915b6d818dacaa2f23361690c65a72a1c93cea..daf4cb398070f3caccb5755d7ae3947a33144a25 100644 (file)
--- a/arch/arm/boot/dts/am335x-baltos-ir2110.dts
+++ b/arch/arm/boot/dts/am335x-baltos-ir2110.dts
@@ -58,21 +58,21 @@
        dr_mode = "host";
 };
 
-&davinci_mdio {
+&davinci_mdio_sw {
        phy0: ethernet-phy@0 {
                reg = <1>;
        };
 };
 
-&cpsw_emac0 {
+&cpsw_port1 {
        phy-mode = "rmii";
-       dual_emac_res_vlan = <1>;
+       ti,dual-emac-pvid = <1>;
        phy-handle = <&phy0>;
 };
 
-&cpsw_emac1 {
+&cpsw_port2 {
        phy-mode = "rgmii-id";
-       dual_emac_res_vlan = <2>;
+       ti,dual-emac-pvid = <2>;
        phy-handle = <&phy1>;
 };
 

diff --git a/arch/arm/boot/dts/am335x-baltos-ir3220.dts b/arch/arm/boot/dts/am335x-baltos-ir3220.dts
index d8d60398d803e05d60cbcc786eea7c5265824fa3..2123bd5894842354b1d5e9512d443e4bd3ba55d8 100644 (file)
--- a/arch/arm/boot/dts/am335x-baltos-ir3220.dts
+++ b/arch/arm/boot/dts/am335x-baltos-ir3220.dts
@@ -103,18 +103,18 @@
        dr_mode = "host";
 };
 
-&cpsw_emac0 {
+&cpsw_port1 {
        phy-mode = "rmii";
-       dual_emac_res_vlan = <1>;
+       ti,dual-emac-pvid = <1>;
        fixed-link {
                speed = <100>;
                full-duplex;
        };
 };
 
-&cpsw_emac1 {
+&cpsw_port2 {
        phy-mode = "rgmii-id";
-       dual_emac_res_vlan = <2>;
+       ti,dual-emac-pvid = <2>;
        phy-handle = <&phy1>;
 };
 

diff --git a/arch/arm/boot/dts/am335x-baltos-ir5221.dts b/arch/arm/boot/dts/am335x-baltos-ir5221.dts
index 8096d459b93f0ac95de8c71bc59d8beb274d8a9c..2f3872dbf4f4d9fd71f69bc8d40067b5bd8826ed 100644 (file)
--- a/arch/arm/boot/dts/am335x-baltos-ir5221.dts
+++ b/arch/arm/boot/dts/am335x-baltos-ir5221.dts
@@ -120,18 +120,18 @@
        dr_mode = "host";
 };
 
-&cpsw_emac0 {
+&cpsw_port1 {
        phy-mode = "rmii";
-       dual_emac_res_vlan = <1>;
+       ti,dual-emac-pvid = <1>;
        fixed-link {
                speed = <100>;
                full-duplex;
        };
 };
 
-&cpsw_emac1 {
+&cpsw_port2 {
        phy-mode = "rgmii-id";
-       dual_emac_res_vlan = <2>;
+       ti,dual-emac-pvid = <2>;
        phy-handle = <&phy1>;
 };
 

diff --git a/arch/arm/boot/dts/am335x-baltos.dtsi b/arch/arm/boot/dts/am335x-baltos.dtsi
index 1103a2cb836fb0ac114f2dfd1748a49f77560c51..36670263029027c4533e4f7ca6d9e1e020d6e421 100644 (file)
--- a/arch/arm/boot/dts/am335x-baltos.dtsi
+++ b/arch/arm/boot/dts/am335x-baltos.dtsi
@@ -339,16 +339,15 @@
        };
 };
 
-&mac {
+&mac_sw {
        pinctrl-names = "default", "sleep";
        pinctrl-0 = <&cpsw_default>;
        pinctrl-1 = <&cpsw_sleep>;
-       dual_emac = <1>;
 
        status = "okay";
 };
 
-&davinci_mdio {
+&davinci_mdio_sw {
        status = "okay";
        pinctrl-names = "default", "sleep";
        pinctrl-0 = <&davinci_mdio_default>;

diff --git a/arch/arm/boot/dts/am335x-netcan-plus-1xx.dts b/arch/arm/boot/dts/am335x-netcan-plus-1xx.dts
index 8303b832aa50c88905c4c8e9fe5b00cc3a4f06ab..57e756b0f19276686d3709f68e0ae802ce276ab1 100644 (file)
--- a/arch/arm/boot/dts/am335x-netcan-plus-1xx.dts
+++ b/arch/arm/boot/dts/am335x-netcan-plus-1xx.dts
@@ -61,21 +61,21 @@
        dr_mode = "host";
 };
 
-&davinci_mdio {
+&davinci_mdio_sw {
        phy0: ethernet-phy@0 {
                reg = <1>;
        };
 };
 
-&cpsw_emac0 {
+&cpsw_port1 {
        phy-mode = "rmii";
-       dual_emac_res_vlan = <1>;
+       ti,dual-emac-pvid = <1>;
        phy-handle = <&phy0>;
 };
 
-&cpsw_emac1 {
+&cpsw_port2 {
        phy-mode = "rgmii-id";
-       dual_emac_res_vlan = <2>;
+       ti,dual-emac-pvid = <2>;
        phy-handle = <&phy1>;
 };
 

diff --git a/arch/arm/boot/dts/am335x-netcom-plus-2xx.dts b/arch/arm/boot/dts/am335x-netcom-plus-2xx.dts
index f8e0e95a751f61f0ad1693b0a5aec90247db38d3..c6cc1c6218a93945ccac3058ac1057a2397dc3dd 100644 (file)
--- a/arch/arm/boot/dts/am335x-netcom-plus-2xx.dts
+++ b/arch/arm/boot/dts/am335x-netcom-plus-2xx.dts
@@ -76,20 +76,20 @@
        status = "okay";
 };
 
-&davinci_mdio {
+&davinci_mdio_sw {
        phy0: ethernet-phy@0 {
                reg = <1>;
        };
 };
 
-&cpsw_emac0 {
+&cpsw_port1 {
        phy-mode = "rmii";
-       dual_emac_res_vlan = <1>;
+       ti,dual-emac-pvid = <1>;
        phy-handle = <&phy0>;
 };
 
-&cpsw_emac1 {
+&cpsw_port2 {
        phy-mode = "rgmii-id";
-       dual_emac_res_vlan = <2>;
+       ti,dual-emac-pvid = <2>;
        phy-handle = <&phy1>;
 };

diff --git a/arch/arm/boot/dts/am335x-netcom-plus-8xx.dts b/arch/arm/boot/dts/am335x-netcom-plus-8xx.dts
index a4e137527215db9d15a326f49282414646989325..96dffd3ffd85e40d6e7184eb21a5c0435dc9a4b2 100644 (file)
--- a/arch/arm/boot/dts/am335x-netcom-plus-8xx.dts
+++ b/arch/arm/boot/dts/am335x-netcom-plus-8xx.dts
@@ -96,20 +96,20 @@
        };
 };
 
-&davinci_mdio {
+&davinci_mdio_sw {
        phy0: ethernet-phy@0 {
                reg = <1>;
        };
 };
 
-&cpsw_emac0 {
+&cpsw_port1 {
        phy-mode = "rmii";
-       dual_emac_res_vlan = <1>;
+       ti,dual-emac-pvid = <1>;
        phy-handle = <&phy0>;
 };
 
-&cpsw_emac1 {
+&cpsw_port2 {
        phy-mode = "rgmii-id";
-       dual_emac_res_vlan = <2>;
+       ti,dual-emac-pvid = <2>;
        phy-handle = <&phy1>;
 };