Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 122051
b: refs/heads/master
c: 2fbb69a
h: refs/heads/master
i:
  122049: 6f31831
  122047: ad15cc6
v: v3
  • Loading branch information
Matt Carlson authored and David S. Miller committed Nov 22, 2008
1 parent 98f4877 commit ed13ff4
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 321d32a052d6b5f71111ebad4fbebea5577f8974
refs/heads/master: 2fbb69aa576f4392c4a04e6874fa429b8bde0f68
21 changes: 21 additions & 0 deletions trunk/drivers/net/phy/broadcom.c
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,21 @@ static struct phy_driver bcm50610_driver = {
.driver = { .owner = THIS_MODULE },
};

static struct phy_driver bcm57780_driver = {
.phy_id = 0x03625d90,
.phy_id_mask = 0xfffffff0,
.name = "Broadcom BCM57780",
.features = PHY_GBIT_FEATURES |
SUPPORTED_Pause | SUPPORTED_Asym_Pause,
.flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
.config_init = bcm54xx_config_init,
.config_aneg = genphy_config_aneg,
.read_status = genphy_read_status,
.ack_interrupt = bcm54xx_ack_interrupt,
.config_intr = bcm54xx_config_intr,
.driver = { .owner = THIS_MODULE },
};

static int __init broadcom_init(void)
{
int ret;
Expand All @@ -565,8 +580,13 @@ static int __init broadcom_init(void)
ret = phy_driver_register(&bcm50610_driver);
if (ret)
goto out_50610;
ret = phy_driver_register(&bcm57780_driver);
if (ret)
goto out_57780;
return ret;

out_57780:
phy_driver_unregister(&bcm50610_driver);
out_50610:
phy_driver_unregister(&bcm5482_driver);
out_5482:
Expand All @@ -585,6 +605,7 @@ static int __init broadcom_init(void)

static void __exit broadcom_exit(void)
{
phy_driver_unregister(&bcm57780_driver);
phy_driver_unregister(&bcm50610_driver);
phy_driver_unregister(&bcm5482_driver);
phy_driver_unregister(&bcm5481_driver);
Expand Down

0 comments on commit ed13ff4

Please sign in to comment.