diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2009-05-19 09:22:30 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-05-20 23:51:58 -0400 |
commit | 64318334bf5096a65c7141bea4833910d112d939 (patch) | |
tree | fd79be311a7258ebc44a121a68329bbcd386f455 /drivers/net/cxgb3/t3_hw.c | |
parent | aa22437e87469fdee94b5344780b4a3dbb87a154 (diff) |
cxgb3: Use generic XENPAK LASI register definitions
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Acked-by: Divy Le Ray <divy@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/cxgb3/t3_hw.c')
-rw-r--r-- | drivers/net/cxgb3/t3_hw.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c index c8a865a7e26c..505a1871d080 100644 --- a/drivers/net/cxgb3/t3_hw.c +++ b/drivers/net/cxgb3/t3_hw.c | |||
@@ -472,29 +472,31 @@ int t3_set_phy_speed_duplex(struct cphy *phy, int speed, int duplex) | |||
472 | 472 | ||
473 | int t3_phy_lasi_intr_enable(struct cphy *phy) | 473 | int t3_phy_lasi_intr_enable(struct cphy *phy) |
474 | { | 474 | { |
475 | return t3_mdio_write(phy, MDIO_MMD_PMAPMD, LASI_CTRL, 1); | 475 | return t3_mdio_write(phy, MDIO_MMD_PMAPMD, MDIO_PMA_LASI_CTRL, |
476 | MDIO_PMA_LASI_LSALARM); | ||
476 | } | 477 | } |
477 | 478 | ||
478 | int t3_phy_lasi_intr_disable(struct cphy *phy) | 479 | int t3_phy_lasi_intr_disable(struct cphy *phy) |
479 | { | 480 | { |
480 | return t3_mdio_write(phy, MDIO_MMD_PMAPMD, LASI_CTRL, 0); | 481 | return t3_mdio_write(phy, MDIO_MMD_PMAPMD, MDIO_PMA_LASI_CTRL, 0); |
481 | } | 482 | } |
482 | 483 | ||
483 | int t3_phy_lasi_intr_clear(struct cphy *phy) | 484 | int t3_phy_lasi_intr_clear(struct cphy *phy) |
484 | { | 485 | { |
485 | u32 val; | 486 | u32 val; |
486 | 487 | ||
487 | return t3_mdio_read(phy, MDIO_MMD_PMAPMD, LASI_STAT, &val); | 488 | return t3_mdio_read(phy, MDIO_MMD_PMAPMD, MDIO_PMA_LASI_STAT, &val); |
488 | } | 489 | } |
489 | 490 | ||
490 | int t3_phy_lasi_intr_handler(struct cphy *phy) | 491 | int t3_phy_lasi_intr_handler(struct cphy *phy) |
491 | { | 492 | { |
492 | unsigned int status; | 493 | unsigned int status; |
493 | int err = t3_mdio_read(phy, MDIO_MMD_PMAPMD, LASI_STAT, &status); | 494 | int err = t3_mdio_read(phy, MDIO_MMD_PMAPMD, MDIO_PMA_LASI_STAT, |
495 | &status); | ||
494 | 496 | ||
495 | if (err) | 497 | if (err) |
496 | return err; | 498 | return err; |
497 | return (status & 1) ? cphy_cause_link_change : 0; | 499 | return (status & MDIO_PMA_LASI_LSALARM) ? cphy_cause_link_change : 0; |
498 | } | 500 | } |
499 | 501 | ||
500 | static const struct adapter_info t3_adap_info[] = { | 502 | static const struct adapter_info t3_adap_info[] = { |