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

ARM: dts: am335x-phycore: 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 Phytec AM335x phyCORE SOM, phyBOARD-WEGA, phyBOARD-REGOR,
PCM-953 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: Teresa Remmet <t.remmet@phytec.de>
Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 2bd43327

arch/arm/boot/dts/am335x-pcm-953.dtsi

+4 −6
Original line number Diff line number Diff line
@@ -123,24 +123,22 @@ AM33XX_PADCONF(AM335X_PIN_GPMC_A11, PIN_INPUT_PULLDOWN, MUX_MODE2) /* gpmc_a11.r 
	};

};



&cpsw_emac1 {

&cpsw_port2 {

	phy-handle = <&phy1>;

	phy-mode = "rgmii-id";

	dual_emac_res_vlan = <2>;

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

	status = "okay";

};



&davinci_mdio {

&davinci_mdio_sw {

	phy1: ethernet-phy@2 {

		reg = <2>;

	};

};



&mac {

	slaves = <2>;

&mac_sw {

	pinctrl-names = "default";

	pinctrl-0 = <&ethernet0_pins &ethernet1_pins>;

	dual_emac;

};



/* Misc */

arch/arm/boot/dts/am335x-phycore-som.dtsi

+8 −6
Original line number Diff line number Diff line
@@ -97,24 +97,26 @@ AM33XX_PADCONF(AM335X_PIN_MDC, PIN_OUTPUT_PULLUP, MUX_MODE0) 
	};

};



&cpsw_emac0 {

&cpsw_port1 {

	phy-handle = <&phy0>;

	phy-mode = "rmii";

	dual_emac_res_vlan = <1>;

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

};



&davinci_mdio {

&cpsw_port2 {

	status = "disabled";

};



&davinci_mdio_sw {

	pinctrl-names = "default";

	pinctrl-0 = <&mdio_pins>;

	status = "okay";



	phy0: ethernet-phy@0 {

		reg = <0>;

	};

};



&mac {

	slaves = <1>;

&mac_sw {

	pinctrl-names = "default";

	pinctrl-0 = <&ethernet0_pins>;

	status = "okay";

arch/arm/boot/dts/am335x-regor.dtsi

+5 −6
Original line number Diff line number Diff line
@@ -85,23 +85,22 @@ AM33XX_PADCONF(AM335X_PIN_GPMC_BEN1, PIN_INPUT_PULLDOWN, MUX_MODE1) /* gpmc_ben1 
	};

};



&cpsw_emac1 {

&cpsw_port2 {

	status = "okay";

	phy-handle = <&phy1>;

	phy-mode = "mii";

	dual_emac_res_vlan = <2>;

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

};



&davinci_mdio {

&davinci_mdio_sw {

	phy1: ethernet-phy@1 {

		reg = <1>;

	};

};



&mac {

	slaves = <2>;

&mac_sw {

	pinctrl-names = "default";

	pinctrl-0 = <&ethernet0_pins &ethernet1_pins>;

	dual_emac = <1>;

};



/* GPIOs */

arch/arm/boot/dts/am335x-wega.dtsi

+5 −6
Original line number Diff line number Diff line
@@ -111,23 +111,22 @@ AM33XX_PADCONF(AM335X_PIN_GPMC_BEN1, PIN_INPUT_PULLDOWN, MUX_MODE1) /* gpmc_ben1 
	};

};



&cpsw_emac1 {

&cpsw_port2 {

	status = "okay";

	phy-handle = <&phy1>;

	phy-mode = "mii";

	dual_emac_res_vlan = <2>;

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

};



&davinci_mdio {

&davinci_mdio_sw {

	phy1: ethernet-phy@1 {

		reg = <1>;

	};

};



&mac {

	slaves = <2>;

&mac_sw {

	pinctrl-names = "default";

	pinctrl-0 = <&ethernet0_pins &ethernet1_pins>;

	dual_emac = <1>;

};



/* MMC */