Skip to content

Commit 2547635

Browse files
arndbarndb
committed
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: Arnd Bergmann <arnd@arndb.de>
2 parents dc3e1ac + dba235f commit 2547635

29 files changed

+657
-94
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
TI CPSW Phy mode Selection Device Tree Bindings
1+
TI CPSW Phy mode Selection Device Tree Bindings (DEPRECATED)
22
-----------------------------------------------
33

44
Required properties:

‎arch/arm/boot/dts/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -719,6 +719,7 @@ dtb-$(CONFIG_SOC_AM33XX) += \
719719
am335x-cm-t335.dtb \
720720
am335x-evm.dtb \
721721
am335x-evmsk.dtb \
722+
am335x-guardian.dtb \
722723
am335x-icev2.dtb \
723724
am335x-lxm.dtb \
724725
am335x-moxa-uc-2101.dtb \

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,3 @@
7272
dual_emac_res_vlan = <2>;
7373
phy-handle = <&phy1>;
7474
};
75-
76-
&phy_sel {
77-
rmii-clock-ext = <1>;
78-
};

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,3 @@
114114
dual_emac_res_vlan = <2>;
115115
phy-handle = <&phy1>;
116116
};
117-
118-
&phy_sel {
119-
rmii-clock-ext = <1>;
120-
};

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,6 @@
133133
phy-handle = <&phy1>;
134134
};
135135

136-
&phy_sel {
137-
rmii-clock-ext = <1>;
138-
};
139-
140136
&dcan1 {
141137
pinctrl-names = "default";
142138
pinctrl-0 = <&dcan1_pins>;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
compatible = "grinn,am335x-chiliboard", "grinn,am335x-chilisom",
1515
"ti,am33xx";
1616

17+
chosen {
18+
stdout-path = &uart0;
19+
};
20+
1721
leds {
1822
compatible = "gpio-leds";
1923
pinctrl-names = "default";
@@ -151,10 +155,6 @@
151155
phy-mode = "rmii";
152156
};
153157

154-
&phy_sel {
155-
rmii-clock-ext;
156-
};
157-
158158
/* USB */
159159
&usb {
160160
status = "okay";

0 commit comments

Comments
 (0)