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

ARM: dts: am335x-bone: 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 BeagleBone 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.

For am335x-sancloud-bbe-common.dtsi also removed duplicated davinci_mdio DT
nodes which already defined in am335x-bone-common.dtsi.

Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent d22e0e1a

arch/arm/boot/dts/am335x-bone-common.dtsi

+8 −5
Original line number Diff line number Diff line
@@ -353,24 +353,27 @@ 
	};

};



&cpsw_emac0 {

&cpsw_port1 {

	phy-handle = <&ethphy0>;

	phy-mode = "mii";

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

};



&mac {

	slaves = <1>;

&cpsw_port2 {

	status = "disabled";

};



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

arch/arm/boot/dts/am335x-boneblack-wireless.dts

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ 
	};

};



&mac {

&mac_sw {

	status = "disabled";

};

arch/arm/boot/dts/am335x-bonegreen-wireless.dts

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 
	};

};



&mac {

&mac_sw {

	status = "disabled";

};

arch/arm/boot/dts/am335x-sancloud-bbe-common.dtsi

+2 −32
Original line number Diff line number Diff line
@@ -40,22 +40,6 @@ 
		>;

	};



	davinci_mdio_default: davinci_mdio_default {

		pinctrl-single,pins = <

			/* MDIO */

			AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLUP | SLEWCTRL_FAST, MUX_MODE0)

			AM33XX_PADCONF(AM335X_PIN_MDC, PIN_OUTPUT_PULLUP, MUX_MODE0)

		>;

	};



	davinci_mdio_sleep: davinci_mdio_sleep {

		pinctrl-single,pins = <

			/* MDIO reset value */

			AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLDOWN, MUX_MODE7)

			AM33XX_PADCONF(AM335X_PIN_MDC, PIN_INPUT_PULLDOWN, MUX_MODE7)

		>;

	};



	usb_hub_ctrl: usb_hub_ctrl {

		pinctrl-single,pins = <

			AM33XX_PADCONF(AM335X_PIN_RMII1_REF_CLK, PIN_OUTPUT_PULLUP, MUX_MODE7)     /* rmii1_refclk.gpio0_29 */
@@ -63,26 +47,12 @@ 
	};

};



&mac {

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

&mac_sw {

	pinctrl-0 = <&cpsw_default>;

	pinctrl-1 = <&cpsw_sleep>;

	status = "okay";

};



&davinci_mdio {

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

	pinctrl-0 = <&davinci_mdio_default>;

	pinctrl-1 = <&davinci_mdio_sleep>;

	status = "okay";



	ethphy0: ethernet-phy@0 {

		reg = <0>;

	};

};



&cpsw_emac0 {

	phy-handle = <&ethphy0>;

&cpsw_port1 {

	phy-mode = "rgmii-id";

};