Commit aff7e503 authored by Grygorii Strashko's avatar Grygorii Strashko Committed by Tony Lindgren
Browse files

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: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 7bf8f37a

arch/arm/boot/dts/am4372.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ 
		serial3 = &uart3;

		serial4 = &uart4;

		serial5 = &uart5;

		ethernet0 = &cpsw_emac0;

		ethernet1 = &cpsw_emac1;

		ethernet0 = &cpsw_port1;

		ethernet1 = &cpsw_port2;

		spi0 = &qspi;

	};

arch/arm/boot/dts/am437x-cm-t43.dts

+6 −8
Original line number Diff line number Diff line
@@ -325,17 +325,15 @@ 
	};

};



&mac {

&mac_sw {

	pinctrl-names = "default";

	pinctrl-0 = <&cpsw_default>;

	dual_emac = <1>;

	status = "okay";

};



&davinci_mdio {

&davinci_mdio_sw {

	pinctrl-names = "default";

	pinctrl-0 = <&davinci_mdio_default>;

	status = "okay";



	ethphy0: ethernet-phy@0 {

		reg = <0>;
@@ -346,16 +344,16 @@ 
	};

};



&cpsw_emac0 {

&cpsw_port1 {

	phy-handle = <&ethphy0>;

	phy-mode = "rgmii-txid";

	dual_emac_res_vlan = <1>;

	ti,dual-emac-pvid = <1>;

};



&cpsw_emac1 {

&cpsw_port2 {

	phy-handle = <&ethphy1>;

	phy-mode = "rgmii-txid";

	dual_emac_res_vlan = <2>;

	ti,dual-emac-pvid = <2>;

};



&dwc3_1 {

arch/arm/boot/dts/am437x-gp-evm.dts

+8 −5
Original line number Diff line number Diff line
@@ -906,28 +906,31 @@ 
	status = "okay";

};



&mac {

	slaves = <1>;

&mac_sw {

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&cpsw_default>;

	pinctrl-1 = <&cpsw_sleep>;

	status = "okay";

};



&davinci_mdio {

&davinci_mdio_sw {

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&davinci_mdio_default>;

	pinctrl-1 = <&davinci_mdio_sleep>;

	status = "okay";



	ethphy0: ethernet-phy@0 {

		reg = <0>;

	};

};



&cpsw_emac0 {

&cpsw_port1 {

	phy-handle = <&ethphy0>;

	phy-mode = "rgmii-rxid";

	ti,dual-emac-pvid = <1>;

};



&cpsw_port2 {

	status = "disabled";

};



&elm {

arch/arm/boot/dts/am437x-idk-evm.dts

+8 −5
Original line number Diff line number Diff line
@@ -483,28 +483,31 @@ 
	};

};



&mac {

	slaves = <1>;

&mac_sw {

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&cpsw_default>;

	pinctrl-1 = <&cpsw_sleep>;

	status = "okay";

};



&davinci_mdio {

&davinci_mdio_sw {

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&davinci_mdio_default>;

	pinctrl-1 = <&davinci_mdio_sleep>;

	status = "okay";



	ethphy0: ethernet-phy@0 {

		reg = <0>;

	};

};



&cpsw_emac0 {

&cpsw_port1 {

	phy-handle = <&ethphy0>;

	phy-mode = "rgmii-rxid";

	ti,dual-emac-pvid = <1>;

};



&cpsw_port2 {

	status = "disabled";

};



&rtc {

arch/arm/boot/dts/am437x-sk-evm.dts

+6 −8
Original line number Diff line number Diff line
@@ -792,19 +792,17 @@ 
	};

};



&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 {

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&davinci_mdio_default>;

	pinctrl-1 = <&davinci_mdio_sleep>;

	status = "okay";



	ethphy0: ethernet-phy@4 {

		reg = <4>;
@@ -815,16 +813,16 @@ 
	};

};



&cpsw_emac0 {

&cpsw_port1 {

	phy-handle = <&ethphy0>;

	phy-mode = "rgmii-rxid";

	dual_emac_res_vlan = <1>;

	ti,dual-emac-pvid = <1>;

};



&cpsw_emac1 {

&cpsw_port2 {

	phy-handle = <&ethphy1>;

	phy-mode = "rgmii-rxid";

	dual_emac_res_vlan = <2>;

	ti,dual-emac-pvid = <2>;

};



&elm {

CRA Git | Maintained and supported by SUSTech CRA and CCSE