|
@@ -133,6 +133,11 @@
|
|
#define MII_88E3016_DISABLE_SCRAMBLER 0x0200
|
|
#define MII_88E3016_DISABLE_SCRAMBLER 0x0200
|
|
#define MII_88E3016_AUTO_MDIX_CROSSOVER 0x0030
|
|
#define MII_88E3016_AUTO_MDIX_CROSSOVER 0x0030
|
|
|
|
|
|
|
|
+#define MII_88E1510_GEN_CTRL_REG_1 0x14
|
|
|
|
+#define MII_88E1510_GEN_CTRL_REG_1_MODE_MASK 0x7
|
|
|
|
+#define MII_88E1510_GEN_CTRL_REG_1_MODE_SGMII 0x1 /* SGMII to copper */
|
|
|
|
+#define MII_88E1510_GEN_CTRL_REG_1_RESET 0x8000 /* Soft reset */
|
|
|
|
+
|
|
MODULE_DESCRIPTION("Marvell PHY driver");
|
|
MODULE_DESCRIPTION("Marvell PHY driver");
|
|
MODULE_AUTHOR("Andy Fleming");
|
|
MODULE_AUTHOR("Andy Fleming");
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_LICENSE("GPL");
|
|
@@ -438,6 +443,41 @@ static int m88e1318_config_aneg(struct phy_device *phydev)
|
|
return m88e1121_config_aneg(phydev);
|
|
return m88e1121_config_aneg(phydev);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+static int m88e1510_config_init(struct phy_device *phydev)
|
|
|
|
+{
|
|
|
|
+ int err;
|
|
|
|
+ int temp;
|
|
|
|
+
|
|
|
|
+ /* SGMII-to-Copper mode initialization */
|
|
|
|
+ if (phydev->interface == PHY_INTERFACE_MODE_SGMII) {
|
|
|
|
+ /* Select page 18 */
|
|
|
|
+ err = phy_write(phydev, MII_MARVELL_PHY_PAGE, 18);
|
|
|
|
+ if (err < 0)
|
|
|
|
+ return err;
|
|
|
|
+
|
|
|
|
+ /* In reg 20, write MODE[2:0] = 0x1 (SGMII to Copper) */
|
|
|
|
+ temp = phy_read(phydev, MII_88E1510_GEN_CTRL_REG_1);
|
|
|
|
+ temp &= ~MII_88E1510_GEN_CTRL_REG_1_MODE_MASK;
|
|
|
|
+ temp |= MII_88E1510_GEN_CTRL_REG_1_MODE_SGMII;
|
|
|
|
+ err = phy_write(phydev, MII_88E1510_GEN_CTRL_REG_1, temp);
|
|
|
|
+ if (err < 0)
|
|
|
|
+ return err;
|
|
|
|
+
|
|
|
|
+ /* PHY reset is necessary after changing MODE[2:0] */
|
|
|
|
+ temp |= MII_88E1510_GEN_CTRL_REG_1_RESET;
|
|
|
|
+ err = phy_write(phydev, MII_88E1510_GEN_CTRL_REG_1, temp);
|
|
|
|
+ if (err < 0)
|
|
|
|
+ return err;
|
|
|
|
+
|
|
|
|
+ /* Reset page selection */
|
|
|
|
+ err = phy_write(phydev, MII_MARVELL_PHY_PAGE, 0);
|
|
|
|
+ if (err < 0)
|
|
|
|
+ return err;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return 0;
|
|
|
|
+}
|
|
|
|
+
|
|
static int m88e1510_config_aneg(struct phy_device *phydev)
|
|
static int m88e1510_config_aneg(struct phy_device *phydev)
|
|
{
|
|
{
|
|
int err;
|
|
int err;
|
|
@@ -1259,6 +1299,7 @@ static struct phy_driver marvell_drivers[] = {
|
|
.features = PHY_GBIT_FEATURES,
|
|
.features = PHY_GBIT_FEATURES,
|
|
.flags = PHY_HAS_INTERRUPT,
|
|
.flags = PHY_HAS_INTERRUPT,
|
|
.probe = marvell_probe,
|
|
.probe = marvell_probe,
|
|
|
|
+ .config_init = &m88e1510_config_init,
|
|
.config_aneg = &m88e1510_config_aneg,
|
|
.config_aneg = &m88e1510_config_aneg,
|
|
.read_status = &marvell_read_status,
|
|
.read_status = &marvell_read_status,
|
|
.ack_interrupt = &marvell_ack_interrupt,
|
|
.ack_interrupt = &marvell_ack_interrupt,
|