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

Commit 25476350 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

One change to deprecate old CPSW Ethernet PHY mode selection driver

With the device tree changes configuring CPSW with a proper PHY driver,
we want to deprecate the old driver to avoid new users for it.

Note that this driver is based on the related dts changes.

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

:
  net: ethernet: ti: cpsw: deprecate cpsw-phy-sel driver

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents dc3e1ac1 dba235fa

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/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -719,6 +719,7 @@ dtb-$(CONFIG_SOC_AM33XX) += \ 
	am335x-cm-t335.dtb \

	am335x-evm.dtb \

	am335x-evmsk.dtb \

	am335x-guardian.dtb \

	am335x-icev2.dtb \

	am335x-lxm.dtb \

	am335x-moxa-uc-2101.dtb \

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