Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <t.remmet@phytec.de>
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

authored by

Grygorii Strashko and committed by
Tony Lindgren
a71c1446 2bd43327

+22 -24
+4 -6
arch/arm/boot/dts/am335x-pcm-953.dtsi
··· 123 123 }; 124 124 }; 125 125 126 - &cpsw_emac1 { 126 + &cpsw_port2 { 127 127 phy-handle = <&phy1>; 128 128 phy-mode = "rgmii-id"; 129 - dual_emac_res_vlan = <2>; 129 + ti,dual-emac-pvid = <2>; 130 130 status = "okay"; 131 131 }; 132 132 133 - &davinci_mdio { 133 + &davinci_mdio_sw { 134 134 phy1: ethernet-phy@2 { 135 135 reg = <2>; 136 136 }; 137 137 }; 138 138 139 - &mac { 140 - slaves = <2>; 139 + &mac_sw { 141 140 pinctrl-names = "default"; 142 141 pinctrl-0 = <&ethernet0_pins &ethernet1_pins>; 143 - dual_emac; 144 142 }; 145 143 146 144 /* Misc */
+8 -6
arch/arm/boot/dts/am335x-phycore-som.dtsi
··· 97 97 }; 98 98 }; 99 99 100 - &cpsw_emac0 { 100 + &cpsw_port1 { 101 101 phy-handle = <&phy0>; 102 102 phy-mode = "rmii"; 103 - dual_emac_res_vlan = <1>; 103 + ti,dual-emac-pvid = <1>; 104 104 }; 105 105 106 - &davinci_mdio { 106 + &cpsw_port2 { 107 + status = "disabled"; 108 + }; 109 + 110 + &davinci_mdio_sw { 107 111 pinctrl-names = "default"; 108 112 pinctrl-0 = <&mdio_pins>; 109 - status = "okay"; 110 113 111 114 phy0: ethernet-phy@0 { 112 115 reg = <0>; 113 116 }; 114 117 }; 115 118 116 - &mac { 117 - slaves = <1>; 119 + &mac_sw { 118 120 pinctrl-names = "default"; 119 121 pinctrl-0 = <&ethernet0_pins>; 120 122 status = "okay";
+5 -6
arch/arm/boot/dts/am335x-regor.dtsi
··· 85 85 }; 86 86 }; 87 87 88 - &cpsw_emac1 { 88 + &cpsw_port2 { 89 + status = "okay"; 89 90 phy-handle = <&phy1>; 90 91 phy-mode = "mii"; 91 - dual_emac_res_vlan = <2>; 92 + ti,dual-emac-pvid = <2>; 92 93 }; 93 94 94 - &davinci_mdio { 95 + &davinci_mdio_sw { 95 96 phy1: ethernet-phy@1 { 96 97 reg = <1>; 97 98 }; 98 99 }; 99 100 100 - &mac { 101 - slaves = <2>; 101 + &mac_sw { 102 102 pinctrl-names = "default"; 103 103 pinctrl-0 = <&ethernet0_pins &ethernet1_pins>; 104 - dual_emac = <1>; 105 104 }; 106 105 107 106 /* GPIOs */
+5 -6
arch/arm/boot/dts/am335x-wega.dtsi
··· 111 111 }; 112 112 }; 113 113 114 - &cpsw_emac1 { 114 + &cpsw_port2 { 115 + status = "okay"; 115 116 phy-handle = <&phy1>; 116 117 phy-mode = "mii"; 117 - dual_emac_res_vlan = <2>; 118 + ti,dual-emac-pvid = <2>; 118 119 }; 119 120 120 - &davinci_mdio { 121 + &davinci_mdio_sw { 121 122 phy1: ethernet-phy@1 { 122 123 reg = <1>; 123 124 }; 124 125 }; 125 126 126 - &mac { 127 - slaves = <2>; 127 + &mac_sw { 128 128 pinctrl-names = "default"; 129 129 pinctrl-0 = <&ethernet0_pins &ethernet1_pins>; 130 - dual_emac = <1>; 131 130 }; 132 131 133 132 /* MMC */