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

ARM: dts: am335x-moxa-uc: 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 Moxa am335x-moxa-uc-210x/8100 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: Johnson Chen <johnsonch.chen@moxa.com>
Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 843470ac

arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -122,24 +122,24 @@ &vbat { 
	regulator-max-microvolt = <5000000>;

};



&mac {

&mac_sw {

	pinctrl-names = "default";

	pinctrl-0 = <&cpsw_default>;

	status = "okay";

};



&davinci_mdio {

&davinci_mdio_sw {

	pinctrl-names = "default";

	pinctrl-0 = <&davinci_mdio_default>;

	status = "okay";

};



&cpsw_emac0 {

	status = "okay";

&cpsw_port1 {

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

};



&cpsw_emac1 {

	status = "okay";

&cpsw_port2 {

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

};



&sham {

arch/arm/boot/dts/am335x-moxa-uc-2101.dts

+3 −4
Original line number Diff line number Diff line
@@ -52,18 +52,17 @@ AM33XX_PADCONF(AM335X_PIN_UART0_RTSN, PIN_INPUT_PULLUP, MUX_MODE4) /* uart0_rts 
	};

};



&davinci_mdio {

&davinci_mdio_sw {

	phy0: ethernet-phy@4 {

		reg = <4>;

	};

};



&cpsw_emac0 {

	status = "okay";

&cpsw_port1 {

	phy-handle = <&phy0>;

	phy-mode = "rmii";

};



&cpsw_emac1 {

&cpsw_port2 {

	status = "disabled";

};

arch/arm/boot/dts/am335x-moxa-uc-8100-common.dtsi

+6 −10
Original line number Diff line number Diff line
@@ -310,17 +310,15 @@ &vbat { 
	regulator-max-microvolt = <5000000>;

};



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

		reg = <4>;
@@ -331,18 +329,16 @@ ethphy1: ethernet-phy@5 { 
	};

};



&cpsw_emac0 {

	status = "okay";

&cpsw_port1 {

	phy-handle = <&ethphy0>;

	phy-mode = "rmii";

	dual_emac_res_vlan = <1>;

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

};



&cpsw_emac1 {

	status = "okay";

&cpsw_port2 {

	phy-handle = <&ethphy1>;

	phy-mode = "rmii";

	dual_emac_res_vlan = <2>;

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

};



&sham {