From: David S. Miller Date: Sat, 1 Nov 2014 18:53:27 +0000 (-0400) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~13256^2~297 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=55b42b5ca2dcf143465968697fe6c6503b05fca1;p=mirror_ubuntu-focal-kernel.git Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Conflicts: drivers/net/phy/marvell.c Simple overlapping changes in drivers/net/phy/marvell.c Signed-off-by: David S. Miller --- 55b42b5ca2dcf143465968697fe6c6503b05fca1 diff --cc drivers/net/phy/marvell.c index 3e3d7cadeb27,225c033b08f3..bb4d780c0838 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@@ -54,10 -54,11 +54,14 @@@ #define MII_M1145_PHY_EXT_CR 0x14 #define MII_M1145_RGMII_RX_DELAY 0x0080 #define MII_M1145_RGMII_TX_DELAY 0x0002 +#define MII_M1145_HWCFG_MODE_SGMII_NO_CLK 0x4 +#define MII_M1145_HWCFG_MODE_MASK 0xf +#define MII_M1145_HWCFG_FIBER_COPPER_AUTO 0x8000 + #define MII_M1145_HWCFG_MODE_SGMII_NO_CLK 0x4 + #define MII_M1145_HWCFG_MODE_MASK 0xf + #define MII_M1145_HWCFG_FIBER_COPPER_AUTO 0x8000 + #define MII_M1111_PHY_LED_CONTROL 0x18 #define MII_M1111_PHY_LED_DIRECT 0x4100 #define MII_M1111_PHY_LED_COMBINE 0x411c