ARM: dts: am335x-phycore: 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 Phytec AM335x phyCORE SOM, phyBOARD-WEGA, phyBOARD-REGOR, PCM-953 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: Teresa Remmet <[email protected]> Signed-off-by: Grygorii Strashko <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
torvalds · Aug 6, 2021 · a71c144 · a71c144
1 parent 2bd4332
commit a71c144
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 24 deletions.
diff --git a/arch/arm/boot/dts/am335x-pcm-953.dtsi b/arch/arm/boot/dts/am335x-pcm-953.dtsi
@@ -123,24 +123,22 @@
  };
 };
 
-&cpsw_emac1 {
+&cpsw_port2 {
  phy-handle = <&phy1>;
  phy-mode = "rgmii-id";
- dual_emac_res_vlan = <2>;
+ ti,dual-emac-pvid = <2>;
  status = "okay";
 };
 
-&davinci_mdio {
+&davinci_mdio_sw {
  phy1: ethernet-phy@2 {
  reg = <2>;
  };
 };
 
-&mac {
- slaves = <2>;
+&mac_sw {
  pinctrl-names = "default";
  pinctrl-0 = <&ethernet0_pins &ethernet1_pins>;
- dual_emac;
 };
 
 /* Misc */

diff --git a/arch/arm/boot/dts/am335x-phycore-som.dtsi b/arch/arm/boot/dts/am335x-phycore-som.dtsi
@@ -97,24 +97,26 @@
  };
 };
 
-&cpsw_emac0 {
+&cpsw_port1 {
  phy-handle = <&phy0>;
  phy-mode = "rmii";
- dual_emac_res_vlan = <1>;
+ ti,dual-emac-pvid = <1>;
 };
 
-&davinci_mdio {
+&cpsw_port2 {
+ status = "disabled";
+};
+
+&davinci_mdio_sw {
  pinctrl-names = "default";
  pinctrl-0 = <&mdio_pins>;
- status = "okay";
 
  phy0: ethernet-phy@0 {
  reg = <0>;
  };
 };
 
-&mac {
- slaves = <1>;
+&mac_sw {
  pinctrl-names = "default";
  pinctrl-0 = <&ethernet0_pins>;
  status = "okay";

diff --git a/arch/arm/boot/dts/am335x-regor.dtsi b/arch/arm/boot/dts/am335x-regor.dtsi
@@ -85,23 +85,22 @@
  };
 };
 
-&cpsw_emac1 {
+&cpsw_port2 {
+ status = "okay";
  phy-handle = <&phy1>;
  phy-mode = "mii";
- dual_emac_res_vlan = <2>;
+ ti,dual-emac-pvid = <2>;
 };
 
-&davinci_mdio {
+&davinci_mdio_sw {
  phy1: ethernet-phy@1 {
  reg = <1>;
  };
 };
 
-&mac {
- slaves = <2>;
+&mac_sw {
  pinctrl-names = "default";
  pinctrl-0 = <&ethernet0_pins &ethernet1_pins>;
- dual_emac = <1>;
 };
 
 /* GPIOs */

diff --git a/arch/arm/boot/dts/am335x-wega.dtsi b/arch/arm/boot/dts/am335x-wega.dtsi
@@ -111,23 +111,22 @@
  };
 };
 
-&cpsw_emac1 {
+&cpsw_port2 {
+ status = "okay";
  phy-handle = <&phy1>;
  phy-mode = "mii";
- dual_emac_res_vlan = <2>;
+ ti,dual-emac-pvid = <2>;
 };
 
-&davinci_mdio {
+&davinci_mdio_sw {
  phy1: ethernet-phy@1 {
  reg = <1>;
  };
 };
 
-&mac {
- slaves = <2>;
+&mac_sw {
  pinctrl-names = "default";
  pinctrl-0 = <&ethernet0_pins &ethernet1_pins>;
- dual_emac = <1>;
 };
 
 /* MMC */