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

ARM: dts: am437x: 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 all am437x 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.

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
aff7e503 7bf8f37a

+38 -33
+2 -2
arch/arm/boot/dts/am4372.dtsi
··· 35 35 serial3 = &uart3; 36 36 serial4 = &uart4; 37 37 serial5 = &uart5; 38 - ethernet0 = &cpsw_emac0; 39 - ethernet1 = &cpsw_emac1; 38 + ethernet0 = &cpsw_port1; 39 + ethernet1 = &cpsw_port2; 40 40 spi0 = &qspi; 41 41 }; 42 42
+6 -8
arch/arm/boot/dts/am437x-cm-t43.dts
··· 325 325 }; 326 326 }; 327 327 328 - &mac { 328 + &mac_sw { 329 329 pinctrl-names = "default"; 330 330 pinctrl-0 = <&cpsw_default>; 331 - dual_emac = <1>; 332 331 status = "okay"; 333 332 }; 334 333 335 - &davinci_mdio { 334 + &davinci_mdio_sw { 336 335 pinctrl-names = "default"; 337 336 pinctrl-0 = <&davinci_mdio_default>; 338 - status = "okay"; 339 337 340 338 ethphy0: ethernet-phy@0 { 341 339 reg = <0>; ··· 344 346 }; 345 347 }; 346 348 347 - &cpsw_emac0 { 349 + &cpsw_port1 { 348 350 phy-handle = <&ethphy0>; 349 351 phy-mode = "rgmii-txid"; 350 - dual_emac_res_vlan = <1>; 352 + ti,dual-emac-pvid = <1>; 351 353 }; 352 354 353 - &cpsw_emac1 { 355 + &cpsw_port2 { 354 356 phy-handle = <&ethphy1>; 355 357 phy-mode = "rgmii-txid"; 356 - dual_emac_res_vlan = <2>; 358 + ti,dual-emac-pvid = <2>; 357 359 }; 358 360 359 361 &dwc3_1 {
+8 -5
arch/arm/boot/dts/am437x-gp-evm.dts
··· 906 906 status = "okay"; 907 907 }; 908 908 909 - &mac { 910 - slaves = <1>; 909 + &mac_sw { 911 910 pinctrl-names = "default", "sleep"; 912 911 pinctrl-0 = <&cpsw_default>; 913 912 pinctrl-1 = <&cpsw_sleep>; 914 913 status = "okay"; 915 914 }; 916 915 917 - &davinci_mdio { 916 + &davinci_mdio_sw { 918 917 pinctrl-names = "default", "sleep"; 919 918 pinctrl-0 = <&davinci_mdio_default>; 920 919 pinctrl-1 = <&davinci_mdio_sleep>; 921 - status = "okay"; 922 920 923 921 ethphy0: ethernet-phy@0 { 924 922 reg = <0>; 925 923 }; 926 924 }; 927 925 928 - &cpsw_emac0 { 926 + &cpsw_port1 { 929 927 phy-handle = <&ethphy0>; 930 928 phy-mode = "rgmii-rxid"; 929 + ti,dual-emac-pvid = <1>; 930 + }; 931 + 932 + &cpsw_port2 { 933 + status = "disabled"; 931 934 }; 932 935 933 936 &elm {
+8 -5
arch/arm/boot/dts/am437x-idk-evm.dts
··· 483 483 }; 484 484 }; 485 485 486 - &mac { 487 - slaves = <1>; 486 + &mac_sw { 488 487 pinctrl-names = "default", "sleep"; 489 488 pinctrl-0 = <&cpsw_default>; 490 489 pinctrl-1 = <&cpsw_sleep>; 491 490 status = "okay"; 492 491 }; 493 492 494 - &davinci_mdio { 493 + &davinci_mdio_sw { 495 494 pinctrl-names = "default", "sleep"; 496 495 pinctrl-0 = <&davinci_mdio_default>; 497 496 pinctrl-1 = <&davinci_mdio_sleep>; 498 - status = "okay"; 499 497 500 498 ethphy0: ethernet-phy@0 { 501 499 reg = <0>; 502 500 }; 503 501 }; 504 502 505 - &cpsw_emac0 { 503 + &cpsw_port1 { 506 504 phy-handle = <&ethphy0>; 507 505 phy-mode = "rgmii-rxid"; 506 + ti,dual-emac-pvid = <1>; 507 + }; 508 + 509 + &cpsw_port2 { 510 + status = "disabled"; 508 511 }; 509 512 510 513 &rtc {
+6 -8
arch/arm/boot/dts/am437x-sk-evm.dts
··· 792 792 }; 793 793 }; 794 794 795 - &mac { 795 + &mac_sw { 796 796 pinctrl-names = "default", "sleep"; 797 797 pinctrl-0 = <&cpsw_default>; 798 798 pinctrl-1 = <&cpsw_sleep>; 799 - dual_emac = <1>; 800 799 status = "okay"; 801 800 }; 802 801 803 - &davinci_mdio { 802 + &davinci_mdio_sw { 804 803 pinctrl-names = "default", "sleep"; 805 804 pinctrl-0 = <&davinci_mdio_default>; 806 805 pinctrl-1 = <&davinci_mdio_sleep>; 807 - status = "okay"; 808 806 809 807 ethphy0: ethernet-phy@4 { 810 808 reg = <4>; ··· 813 815 }; 814 816 }; 815 817 816 - &cpsw_emac0 { 818 + &cpsw_port1 { 817 819 phy-handle = <&ethphy0>; 818 820 phy-mode = "rgmii-rxid"; 819 - dual_emac_res_vlan = <1>; 821 + ti,dual-emac-pvid = <1>; 820 822 }; 821 823 822 - &cpsw_emac1 { 824 + &cpsw_port2 { 823 825 phy-handle = <&ethphy1>; 824 826 phy-mode = "rgmii-rxid"; 825 - dual_emac_res_vlan = <2>; 827 + ti,dual-emac-pvid = <2>; 826 828 }; 827 829 828 830 &elm {
+8 -5
arch/arm/boot/dts/am43x-epos-evm.dts
··· 550 550 cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; 551 551 }; 552 552 553 - &mac { 553 + &mac_sw { 554 554 pinctrl-names = "default", "sleep"; 555 555 pinctrl-0 = <&cpsw_default>; 556 556 pinctrl-1 = <&cpsw_sleep>; 557 557 status = "okay"; 558 - slaves = <1>; 559 558 }; 560 559 561 - &davinci_mdio { 560 + &davinci_mdio_sw { 562 561 pinctrl-names = "default", "sleep"; 563 562 pinctrl-0 = <&davinci_mdio_default>; 564 563 pinctrl-1 = <&davinci_mdio_sleep>; 565 - status = "okay"; 566 564 567 565 ethphy0: ethernet-phy@16 { 568 566 reg = <16>; 569 567 }; 570 568 }; 571 569 572 - &cpsw_emac0 { 570 + &cpsw_port1 { 573 571 phy-handle = <&ethphy0>; 574 572 phy-mode = "rmii"; 575 573 phys = <&phy_gmii_sel 1 1>; 574 + ti,dual-emac-pvid = <1>; 575 + }; 576 + 577 + &cpsw_port2 { 578 + status = "disabled"; 576 579 }; 577 580 578 581 &i2c0 {