aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/phy
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2007-11-04 17:08:51 -0500
committerJeff Garzik <jeff@garzik.org>2007-11-05 17:58:36 -0500
commitac8c635abb7bce730a315be0525bea0c29e742d0 (patch)
tree26ebeecb155fffc7b01316d25c27737a4059d6b3 /drivers/net/phy
parentd2ea732e9ecb68841206f2761ae91360da87cfac (diff)
phylib: Add ID for Marvell 88E1240
Add PHY IDs for Marvell 88E1240. It seems to have close enough programming models to 1111/1112 for basic support at least. Also clean up whitespace in the ID list a bit. Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/phy')
-rw-r--r--drivers/net/phy/marvell.c23
1 files changed, 18 insertions, 5 deletions
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index d2ede5ff9fff..035fd41fb61f 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -265,7 +265,7 @@ static struct phy_driver marvell_drivers[] = {
265 .read_status = &genphy_read_status, 265 .read_status = &genphy_read_status,
266 .ack_interrupt = &marvell_ack_interrupt, 266 .ack_interrupt = &marvell_ack_interrupt,
267 .config_intr = &marvell_config_intr, 267 .config_intr = &marvell_config_intr,
268 .driver = {.owner = THIS_MODULE,}, 268 .driver = { .owner = THIS_MODULE },
269 }, 269 },
270 { 270 {
271 .phy_id = 0x01410c90, 271 .phy_id = 0x01410c90,
@@ -278,7 +278,7 @@ static struct phy_driver marvell_drivers[] = {
278 .read_status = &genphy_read_status, 278 .read_status = &genphy_read_status,
279 .ack_interrupt = &marvell_ack_interrupt, 279 .ack_interrupt = &marvell_ack_interrupt,
280 .config_intr = &marvell_config_intr, 280 .config_intr = &marvell_config_intr,
281 .driver = {.owner = THIS_MODULE,}, 281 .driver = { .owner = THIS_MODULE },
282 }, 282 },
283 { 283 {
284 .phy_id = 0x01410cc0, 284 .phy_id = 0x01410cc0,
@@ -291,7 +291,7 @@ static struct phy_driver marvell_drivers[] = {
291 .read_status = &genphy_read_status, 291 .read_status = &genphy_read_status,
292 .ack_interrupt = &marvell_ack_interrupt, 292 .ack_interrupt = &marvell_ack_interrupt,
293 .config_intr = &marvell_config_intr, 293 .config_intr = &marvell_config_intr,
294 .driver = {.owner = THIS_MODULE,}, 294 .driver = { .owner = THIS_MODULE },
295 }, 295 },
296 { 296 {
297 .phy_id = 0x01410cd0, 297 .phy_id = 0x01410cd0,
@@ -304,8 +304,21 @@ static struct phy_driver marvell_drivers[] = {
304 .read_status = &genphy_read_status, 304 .read_status = &genphy_read_status,
305 .ack_interrupt = &marvell_ack_interrupt, 305 .ack_interrupt = &marvell_ack_interrupt,
306 .config_intr = &marvell_config_intr, 306 .config_intr = &marvell_config_intr,
307 .driver = {.owner = THIS_MODULE,}, 307 .driver = { .owner = THIS_MODULE },
308 } 308 },
309 {
310 .phy_id = 0x01410e30,
311 .phy_id_mask = 0xfffffff0,
312 .name = "Marvell 88E1240",
313 .features = PHY_GBIT_FEATURES,
314 .flags = PHY_HAS_INTERRUPT,
315 .config_init = &m88e1111_config_init,
316 .config_aneg = &marvell_config_aneg,
317 .read_status = &genphy_read_status,
318 .ack_interrupt = &marvell_ack_interrupt,
319 .config_intr = &marvell_config_intr,
320 .driver = { .owner = THIS_MODULE },
321 },
309}; 322};
310 323
311static int __init marvell_init(void) 324static int __init marvell_init(void)