net: phy: marvell: Only configure RGMII delays when using RGMII
authorAndrew Lunn <andrew@lunn.ch>
Tue, 31 Oct 2017 19:31:28 +0000 (20:31 +0100)
committerDavid S. Miller <davem@davemloft.net>
Wed, 1 Nov 2017 02:26:08 +0000 (11:26 +0900)
commit14fc0abafe159fbe8bbcfeca157ef3ba139fa75f
tree077b5bd3eabd726e9edaa8e78021a7eaa13ed559
parentb34a264fabdce972ca8d1cff38d1b48ecb963719
net: phy: marvell: Only configure RGMII delays when using RGMII

The fix 5987feb38aa5 ("net: phy: marvell: logical vs bitwise OR typo")
uncovered another bug in the Marvell PHY driver, which broke the
Marvell OpenRD platform. It relies on the bootloader configuring the
RGMII delays and does not specify a phy-mode in its device tree.  The
PHY driver should only configure RGMII delays if the phy mode
indicates it is using RGMII. Without anything in device tree, the
mv643xx Ethernet driver defaults to GMII.

Fixes: 5987feb38aa5 ("net: phy: marvell: logical vs bitwise OR typo")
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/phy/marvell.c