korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-18 17:54:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

net: phy: marvell: Use the set_polarity helper

Browse Source 
Some of the init functions unilaterally enable set auto cross over
without using the helper. Make use of the helper, and respect the
phydev MDI configuration.

Clean up the #define used while setting polarity, and the other
functions of the bits in the register.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Andrew Lunn 2017-07-30 22:41:49 +02:00 committed by David S. Miller
parent 864dc729d5
commit fecd5e910e
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/net/phy/marvell.c
View File

@ -55,10 +55,12 @@
#define MII_M1011_IMASK_INIT 0x6400 #define MII_M1011_IMASK_INIT 0x6400
#define MII_M1011_IMASK_CLEAR 0x0000 #define MII_M1011_IMASK_CLEAR 0x0000
#define MII_M1011_PHY_SCR 0x10 #define MII_M1011_PHY_SCR 0x10
#define MII_M1011_PHY_SCR_MDI 0x0000 #define MII_M1011_PHY_SCR_DOWNSHIFT_EN BIT(11)
#define MII_M1011_PHY_SCR_MDI_X 0x0020 #define MII_M1011_PHY_SCR_DOWNSHIFT_SHIFT 12
#define MII_M1011_PHY_SCR_AUTO_CROSS 0x0060 #define MII_M1011_PHY_SCR_MDI (0x0 << 5)
#define MII_M1011_PHY_SCR_MDI_X (0x1 << 5)
#define MII_M1011_PHY_SCR_AUTO_CROSS (0x3 << 5)
#define MII_M1111_PHY_LED_CONTROL 0x18 #define MII_M1111_PHY_LED_CONTROL 0x18
#define MII_M1111_PHY_LED_DIRECT 0x4100 #define MII_M1111_PHY_LED_DIRECT 0x4100
@ -486,8 +488,7 @@ static int m88e1121_config_aneg(struct phy_device *phydev)
if (err < 0) if (err < 0)
return err; return err;
err = phy_write(phydev, MII_M1011_PHY_SCR, err = marvell_set_polarity(phydev, phydev->mdix_ctrl);
MII_M1011_PHY_SCR_AUTO_CROSS);
if (err < 0) if (err < 0)
return err; return err;
@ -655,10 +656,13 @@ static int m88e1116r_config_init(struct phy_device *phydev)
if (err < 0) if (err < 0)
return err; return err;
err = marvell_set_polarity(phydev, phydev->mdix_ctrl);
if (err < 0)
return err;
temp = phy_read(phydev, MII_M1011_PHY_SCR); temp = phy_read(phydev, MII_M1011_PHY_SCR);
temp |= (7 << 12); /* max number of gigabit attempts */ temp |= (7 << MII_M1011_PHY_SCR_DOWNSHIFT_SHIFT);
temp |= (1 << 11); /* enable downshift */ temp |= MII_M1011_PHY_SCR_DOWNSHIFT_EN;
temp |= MII_M1011_PHY_SCR_AUTO_CROSS;
err = phy_write(phydev, MII_M1011_PHY_SCR, temp); err = phy_write(phydev, MII_M1011_PHY_SCR, temp);
if (err < 0) if (err < 0)
return err; return err;
@ -891,8 +895,7 @@ static int m88e1118_config_aneg(struct phy_device *phydev)
if (err < 0) if (err < 0)
return err; return err;
err = phy_write(phydev, MII_M1011_PHY_SCR, err = marvell_set_polarity(phydev, phydev->mdix_ctrl);
MII_M1011_PHY_SCR_AUTO_CROSS);
if (err < 0) if (err < 0)
return err; return err;