diff options
author | Andy Fleming <afleming@gmail.com> | 2013-11-20 17:38:16 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-11-20 22:08:50 -0500 |
commit | 0508019cca6c425a9db79b2b3aa37afba0a5542b (patch) | |
tree | 6fdede2d50175b88622b815af2e22e4f48f68597 | |
parent | 68c6beb373955da0886d8f4f5995b3922ceda4be (diff) |
net/phy: Add VSC8234 support
Vitesse VSC8234 is quad port 10/100/1000BASE-T PHY
with SGMII and SERDES MAC interfaces.
Signed-off-by: Andy Fleming <afleming@gmail.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Shruti Kanetkar <Shruti@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/phy/vitesse.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/drivers/net/phy/vitesse.c b/drivers/net/phy/vitesse.c index 69b482bce7d2..59e3b58a3723 100644 --- a/drivers/net/phy/vitesse.c +++ b/drivers/net/phy/vitesse.c | |||
@@ -54,6 +54,7 @@ | |||
54 | #define MII_VSC8221_AUXCONSTAT_INIT 0x0004 /* need to set this bit? */ | 54 | #define MII_VSC8221_AUXCONSTAT_INIT 0x0004 /* need to set this bit? */ |
55 | #define MII_VSC8221_AUXCONSTAT_RESERVED 0x0004 | 55 | #define MII_VSC8221_AUXCONSTAT_RESERVED 0x0004 |
56 | 56 | ||
57 | #define PHY_ID_VSC8234 0x000fc620 | ||
57 | #define PHY_ID_VSC8244 0x000fc6c0 | 58 | #define PHY_ID_VSC8244 0x000fc6c0 |
58 | #define PHY_ID_VSC8221 0x000fc550 | 59 | #define PHY_ID_VSC8221 0x000fc550 |
59 | #define PHY_ID_VSC8211 0x000fc4b0 | 60 | #define PHY_ID_VSC8211 0x000fc4b0 |
@@ -118,7 +119,8 @@ static int vsc82xx_config_intr(struct phy_device *phydev) | |||
118 | 119 | ||
119 | if (phydev->interrupts == PHY_INTERRUPT_ENABLED) | 120 | if (phydev->interrupts == PHY_INTERRUPT_ENABLED) |
120 | err = phy_write(phydev, MII_VSC8244_IMASK, | 121 | err = phy_write(phydev, MII_VSC8244_IMASK, |
121 | phydev->drv->phy_id == PHY_ID_VSC8244 ? | 122 | (phydev->drv->phy_id == PHY_ID_VSC8234 || |
123 | phydev->drv->phy_id == PHY_ID_VSC8244) ? | ||
122 | MII_VSC8244_IMASK_MASK : | 124 | MII_VSC8244_IMASK_MASK : |
123 | MII_VSC8221_IMASK_MASK); | 125 | MII_VSC8221_IMASK_MASK); |
124 | else { | 126 | else { |
@@ -149,9 +151,21 @@ static int vsc8221_config_init(struct phy_device *phydev) | |||
149 | */ | 151 | */ |
150 | } | 152 | } |
151 | 153 | ||
152 | /* Vitesse 824x */ | 154 | /* Vitesse 82xx */ |
153 | static struct phy_driver vsc82xx_driver[] = { | 155 | static struct phy_driver vsc82xx_driver[] = { |
154 | { | 156 | { |
157 | .phy_id = PHY_ID_VSC8234, | ||
158 | .name = "Vitesse VSC8234", | ||
159 | .phy_id_mask = 0x000ffff0, | ||
160 | .features = PHY_GBIT_FEATURES, | ||
161 | .flags = PHY_HAS_INTERRUPT, | ||
162 | .config_init = &vsc824x_config_init, | ||
163 | .config_aneg = &genphy_config_aneg, | ||
164 | .read_status = &genphy_read_status, | ||
165 | .ack_interrupt = &vsc824x_ack_interrupt, | ||
166 | .config_intr = &vsc82xx_config_intr, | ||
167 | .driver = { .owner = THIS_MODULE,}, | ||
168 | }, { | ||
155 | .phy_id = PHY_ID_VSC8244, | 169 | .phy_id = PHY_ID_VSC8244, |
156 | .name = "Vitesse VSC8244", | 170 | .name = "Vitesse VSC8244", |
157 | .phy_id_mask = 0x000fffc0, | 171 | .phy_id_mask = 0x000fffc0, |
@@ -207,6 +221,7 @@ module_init(vsc82xx_init); | |||
207 | module_exit(vsc82xx_exit); | 221 | module_exit(vsc82xx_exit); |
208 | 222 | ||
209 | static struct mdio_device_id __maybe_unused vitesse_tbl[] = { | 223 | static struct mdio_device_id __maybe_unused vitesse_tbl[] = { |
224 | { PHY_ID_VSC8234, 0x000ffff0 }, | ||
210 | { PHY_ID_VSC8244, 0x000fffc0 }, | 225 | { PHY_ID_VSC8244, 0x000fffc0 }, |
211 | { PHY_ID_VSC8221, 0x000ffff0 }, | 226 | { PHY_ID_VSC8221, 0x000ffff0 }, |
212 | { PHY_ID_VSC8211, 0x000ffff0 }, | 227 | { PHY_ID_VSC8211, 0x000ffff0 }, |