Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 847aed39 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v5.1/dt-cpsw-phy' of... 

Merge tag 'omap-for-v5.1/dt-cpsw-phy' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/dt

Device tree changes to make CPSW Ethernet use proper phy driver

We now have a proper PHY driver with drivers/phy/ti/phy-gmii-sel.c to
configure the CPSW PHY. These changes update all CPSW users to use the
new driver that already got merged during v5.0 merge window.

* tag 'omap-for-v5.1/dt-cpsw-phy' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  dt-bindings: net: ti: deprecate cpsw-phy-sel bindings
  ARM: dts: am335x: switch to use phy-gmii-sel
  ARM: dts: am4372: switch to use phy-gmii-sel
  ARM: dts: dm814x: switch to use phy-gmii-sel
  ARM: dts: dra7: switch to use phy-gmii-sel

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 94224c25 bae2bf97

Documentation/devicetree/bindings/net/cpsw-phy-sel.txt

+1 −1
Original line number Diff line number Diff line 
TI CPSW Phy mode Selection Device Tree Bindings

TI CPSW Phy mode Selection Device Tree Bindings (DEPRECATED)

-----------------------------------------------



Required properties:

arch/arm/boot/dts/am335x-baltos-ir2110.dts

+0 −4
Original line number Diff line number Diff line
@@ -72,7 +72,3 @@ 
	dual_emac_res_vlan = <2>;

	phy-handle = <&phy1>;

};
 


&phy_sel {

	rmii-clock-ext = <1>;

};

arch/arm/boot/dts/am335x-baltos-ir3220.dts

+0 −4
Original line number Diff line number Diff line
@@ -114,7 +114,3 @@ 
	dual_emac_res_vlan = <2>;

	phy-handle = <&phy1>;

};
 


&phy_sel {

	rmii-clock-ext = <1>;

};

arch/arm/boot/dts/am335x-baltos-ir5221.dts

+0 −4
Original line number Diff line number Diff line
@@ -133,10 +133,6 @@ 
	phy-handle = <&phy1>;

};



&phy_sel {

	rmii-clock-ext = <1>;

};



&dcan1 {

	pinctrl-names = "default";

	pinctrl-0 = <&dcan1_pins>;

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

+0 −4
Original line number Diff line number Diff line
@@ -155,10 +155,6 @@ 
	phy-mode = "rmii";

};



&phy_sel {

	rmii-clock-ext;

};



/* USB */

&usb {

	status = "okay";