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

ARM: dts: am335x-evm/evmsk/icev2: 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 amam335x-evm, am335x-evmsk and am335x-icev2 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 1a93456d

arch/arm/boot/dts/am335x-evm.dts

+8 −5
Original line number Diff line number Diff line
@@ -684,28 +684,31 @@ vmmc_reg: regulator@12 { 
	};

};



&mac {

&mac_sw {

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

	pinctrl-0 = <&cpsw_default>;

	pinctrl-1 = <&cpsw_sleep>;

	status = "okay";

	slaves = <1>;

};



&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-id";

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

};



&cpsw_port2 {

	 status = "disabled";

};



&tscadc {

arch/arm/boot/dts/am335x-evmsk.dts

+6 −8
Original line number Diff line number Diff line
@@ -596,19 +596,17 @@ vmmc_reg: regulator@12 { 
	};

};



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

		reg = <0>;
@@ -619,16 +617,16 @@ ethphy1: ethernet-phy@1 { 
	};

};



&cpsw_emac0 {

&cpsw_port1 {

	phy-handle = <&ethphy0>;

	phy-mode = "rgmii-id";

	dual_emac_res_vlan = <1>;

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

};



&cpsw_emac1 {

&cpsw_port2 {

	phy-handle = <&ethphy1>;

	phy-mode = "rgmii-id";

	dual_emac_res_vlan = <2>;

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

};



&mmc1 {

arch/arm/boot/dts/am335x-icev2.dts

+6 −8
Original line number Diff line number Diff line
@@ -474,31 +474,29 @@ p10 { 
	};

};



&cpsw_emac0 {

&cpsw_port1 {

	phy-handle = <&ethphy0>;

	phy-mode = "rmii";

	dual_emac_res_vlan = <1>;

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

};



&cpsw_emac1 {

&cpsw_port2 {

	phy-handle = <&ethphy1>;

	phy-mode = "rmii";

	dual_emac_res_vlan = <2>;

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

};



&mac {

&mac_sw {

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

	pinctrl-0 = <&cpsw_default>;

	pinctrl-1 = <&cpsw_sleep>;

	status = "okay";

	dual_emac;

};



&davinci_mdio {

&davinci_mdio_sw {

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

	pinctrl-0 = <&davinci_mdio_default>;

	pinctrl-1 = <&davinci_mdio_sleep>;

	status = "okay";

	reset-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>;

	reset-delay-us = <2>;   /* PHY datasheet states 1uS min */