From: Arnd Bergmann Date: Fri, 22 Feb 2019 13:53:48 +0000 (+0100) Subject: Merge tag 'omap-for-v5.0/fixes-rc7-signed' of git://git.kernel.org/pub/scm/linux... X-Git-Tag: v5.0-rc8~7^2~1 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=3858bfca2b7811d97121910a87dc42f33498f2fe;p=linux-2.6-block.git Merge tag 'omap-for-v5.0/fixes-rc7-signed' of git://git./linux/kernel/git/tmlind/linux-omap into arm/fixes Two am335x ethernet phy mode fixes for v5.0-rc cycle Recent changes with commit cd28d1d6e52e: ("net: phy: at803x: Disable phy delay for RGMII mode") broke Ethernet on am335x-evmsk, and turns out some device driver fixes are needed. Even without the driver fixes, am335x needs to run in rgmii-id mode instead rgmii-txid mode. Things have been working based on luck as the broken driver has been configuring rgmii-id mode. Let's fix that as that way things work as they're supposed to work from hardware wiring point of view. * tag 'omap-for-v5.0/fixes-rc7-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: am335x-evm: Fix PHY mode for ethernet ARM: dts: am335x-evmsk: Fix PHY mode for ethernet Signed-off-by: Arnd Bergmann --- 3858bfca2b7811d97121910a87dc42f33498f2fe