Skip to content

Commit

Permalink
Merge tag 'omap-for-v5.1/cpsw-signed' of git://git.kernel.org/pub/scm…
Browse files Browse the repository at this point in the history
…/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>
  • Loading branch information
Arnd Bergmann committed Feb 22, 2019
2 parents dc3e1ac + dba235f commit 2547635
Show file tree
Hide file tree
Showing 29 changed files with 657 additions and 94 deletions.
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/net/cpsw-phy-sel.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
TI CPSW Phy mode Selection Device Tree Bindings
TI CPSW Phy mode Selection Device Tree Bindings (DEPRECATED)
-----------------------------------------------

Required properties:
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 0 additions & 4 deletions arch/arm/boot/dts/am335x-baltos-ir2110.dts
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,3 @@
dual_emac_res_vlan = <2>;
phy-handle = <&phy1>;
};

&phy_sel {
rmii-clock-ext = <1>;
};
4 changes: 0 additions & 4 deletions arch/arm/boot/dts/am335x-baltos-ir3220.dts
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,3 @@
dual_emac_res_vlan = <2>;
phy-handle = <&phy1>;
};

&phy_sel {
rmii-clock-ext = <1>;
};
4 changes: 0 additions & 4 deletions arch/arm/boot/dts/am335x-baltos-ir5221.dts
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,6 @@
phy-handle = <&phy1>;
};

&phy_sel {
rmii-clock-ext = <1>;
};

&dcan1 {
pinctrl-names = "default";
pinctrl-0 = <&dcan1_pins>;
Expand Down
8 changes: 4 additions & 4 deletions arch/arm/boot/dts/am335x-chiliboard.dts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
compatible = "grinn,am335x-chiliboard", "grinn,am335x-chilisom",
"ti,am33xx";

chosen {
stdout-path = &uart0;
};

leds {
compatible = "gpio-leds";
pinctrl-names = "default";
Expand Down Expand Up @@ -151,10 +155,6 @@
phy-mode = "rmii";
};

&phy_sel {
rmii-clock-ext;
};

/* USB */
&usb {
status = "okay";
Expand Down
Loading

0 comments on commit 2547635

Please sign in to comment.