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

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>

authored by

Grygorii Strashko and committed by
Tony Lindgren
d56fe359 67e97cc6

+9 -42
-27
arch/arm/boot/dts/am571x-idk.dts
··· 208 208 pinctrl-1 = <&mmc2_pins_hs>; 209 209 pinctrl-2 = <&mmc2_pins_ddr_rev20 &mmc2_iodelay_ddr_conf>; 210 210 }; 211 - 212 - &mac_sw { 213 - pinctrl-names = "default", "sleep"; 214 - status = "okay"; 215 - }; 216 - 217 - &cpsw_port1 { 218 - phy-handle = <&ethphy0_sw>; 219 - phy-mode = "rgmii-rxid"; 220 - ti,dual-emac-pvid = <1>; 221 - }; 222 - 223 - &cpsw_port2 { 224 - phy-handle = <&ethphy1_sw>; 225 - phy-mode = "rgmii-rxid"; 226 - ti,dual-emac-pvid = <2>; 227 - }; 228 - 229 - &davinci_mdio_sw { 230 - ethphy0_sw: ethernet-phy@0 { 231 - reg = <0>; 232 - }; 233 - 234 - ethphy1_sw: ethernet-phy@1 { 235 - reg = <1>; 236 - }; 237 - };
-5
arch/arm/boot/dts/am572x-idk.dts
··· 27 27 pinctrl-1 = <&mmc2_pins_hs>; 28 28 pinctrl-2 = <&mmc2_pins_ddr_rev20>; 29 29 }; 30 - 31 - &mac { 32 - status = "okay"; 33 - dual_emac; 34 - };
-5
arch/arm/boot/dts/am574x-idk.dts
··· 36 36 pinctrl-2 = <&mmc2_pins_default>; 37 37 }; 38 38 39 - &mac { 40 - status = "okay"; 41 - dual_emac; 42 - }; 43 - 44 39 &m_can0 { 45 40 status = "disabled"; 46 41 };
+9 -5
arch/arm/boot/dts/am57xx-idk-common.dtsi
··· 448 448 ext-clk-src; 449 449 }; 450 450 451 - &cpsw_emac0 { 451 + &mac_sw { 452 + status = "okay"; 453 + }; 454 + 455 + &cpsw_port1 { 452 456 phy-handle = <&ethphy0>; 453 457 phy-mode = "rgmii-rxid"; 454 - dual_emac_res_vlan = <1>; 458 + ti,dual-emac-pvid = <1>; 455 459 }; 456 460 457 - &cpsw_emac1 { 461 + &cpsw_port2 { 458 462 phy-handle = <&ethphy1>; 459 463 phy-mode = "rgmii-rxid"; 460 - dual_emac_res_vlan = <2>; 464 + ti,dual-emac-pvid = <2>; 461 465 }; 462 466 463 - &davinci_mdio { 467 + &davinci_mdio_sw { 464 468 ethphy0: ethernet-phy@0 { 465 469 reg = <0>; 466 470 };