cxgb3: Use generic XENPAK LASI register definitions
Subsystems (2)
PATCH 2/2 cxgb3: Use generic XENPAK LASI register definitions
Signed-off-by Ben Hutchings <[email protected]>
--- drivers/net/cxgb3/ael1002.c | 3 ++- drivers/net/cxgb3/common.h | 10 ---------- drivers/net/cxgb3/t3_hw.c | 12 +++++++----- 3 files changed, 9 insertions(+), 16 deletions(-)
drivers/net/cxgb3/ael1002.c +2 -1
@@ -1007,7 +1007,8 @@ static int ael2005_reset(struct cphy *phy, int wait)int err;unsigned int lasi_ctrl; - err =t3_mdio_read (phy,MDIO_MMD_PMAPMD ,LASI_CTRL , &lasi_ctrl); + err =t3_mdio_read (phy,MDIO_MMD_PMAPMD ,MDIO_PMA_LASI_CTRL , + &lasi_ctrl);if (err)return err;
drivers/net/cxgb3/common.h +0 -10
@@ -521,16 +521,6 @@ enum {MAC_RXFIFO_SIZE =32768 }; -/* LASI control and status registers */ -enum { -RX_ALARM_CTRL =0x9000 , -TX_ALARM_CTRL =0x9001 , -LASI_CTRL =0x9002 , -RX_ALARM_STAT =0x9003 , -TX_ALARM_STAT =0x9004 , -LASI_STAT =0x9005 -}; -/* PHY loopback direction */ enum {PHY_LOOPBACK_TX =1 ,
drivers/net/cxgb3/t3_hw.c +7 -5
@@ -472,29 +472,31 @@ int t3_set_phy_speed_duplex(struct cphy *phy, int speed, int duplex)int t3_phy_lasi_intr_enable (struct cphy *phy) { -return t3_mdio_write (phy,MDIO_MMD_PMAPMD ,LASI_CTRL ,1 ); +return t3_mdio_write (phy,MDIO_MMD_PMAPMD ,MDIO_PMA_LASI_CTRL , +MDIO_PMA_LASI_LSALARM ); }int t3_phy_lasi_intr_disable (struct cphy *phy) { -return t3_mdio_write (phy,MDIO_MMD_PMAPMD ,LASI_CTRL ,0 ); +return t3_mdio_write (phy,MDIO_MMD_PMAPMD ,MDIO_PMA_LASI_CTRL ,0 ); }int t3_phy_lasi_intr_clear (struct cphy *phy) {u32 val; -return t3_mdio_read (phy,MDIO_MMD_PMAPMD ,LASI_STAT , &val); +return t3_mdio_read (phy,MDIO_MMD_PMAPMD ,MDIO_PMA_LASI_STAT , &val); }int t3_phy_lasi_intr_handler (struct cphy *phy) {unsigned int status; -int err =t3_mdio_read (phy,MDIO_MMD_PMAPMD ,LASI_STAT , &status); +int err =t3_mdio_read (phy,MDIO_MMD_PMAPMD ,MDIO_PMA_LASI_STAT , + &status);if (err)return err; -return (status &1 ) ? cphy_cause_link_change :0 ; +return (status &MDIO_PMA_LASI_LSALARM ) ? cphy_cause_link_change :0 ; }static const struct adapter_info t3_adap_info[] = {
Signature · 3 lines
Ben Hutchings, Senior Software Engineer, Solarflare Communications Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked.
Quoted 2 lines · Ben Hutchings
Signed-off-by Ben Hutchings <[email protected]>
Acked-by Divy Le Ray <[email protected]>
Quoted 84 lines
--- drivers/net/cxgb3/ael1002.c | 3 ++- drivers/net/cxgb3/common.h | 10 ---------- drivers/net/cxgb3/t3_hw.c | 12 +++++++----- 3 files changed, 9 insertions(+), 16 deletions(-)drivers/net/cxgb3/ael1002.c +2
-1@@ -1007,7 +1007,8 @@ static int ael2005_reset(struct cphy *phy, int wait)int err;unsigned int lasi_ctrl; - err =t3_mdio_read (phy,MDIO_MMD_PMAPMD ,LASI_CTRL , &lasi_ctrl); + err =t3_mdio_read (phy,MDIO_MMD_PMAPMD ,MDIO_PMA_LASI_CTRL , + &lasi_ctrl);if (err)return err;drivers/net/cxgb3/common.h +0
-10@@ -521,16 +521,6 @@ enum {MAC_RXFIFO_SIZE =32768 }; -/* LASI control and status registers */ -enum { -RX_ALARM_CTRL =0x9000 , -TX_ALARM_CTRL =0x9001 , -LASI_CTRL =0x9002 , -RX_ALARM_STAT =0x9003 , -TX_ALARM_STAT =0x9004 , -LASI_STAT =0x9005 -}; -/* PHY loopback direction */ enum {PHY_LOOPBACK_TX =1 ,drivers/net/cxgb3/t3_hw.c +7
-5@@ -472,29 +472,31 @@ int t3_set_phy_speed_duplex(struct cphy *phy, int speed, int duplex)int t3_phy_lasi_intr_enable (struct cphy *phy) { -return t3_mdio_write (phy,MDIO_MMD_PMAPMD ,LASI_CTRL ,1 ); +return t3_mdio_write (phy,MDIO_MMD_PMAPMD ,MDIO_PMA_LASI_CTRL , +MDIO_PMA_LASI_LSALARM ); }int t3_phy_lasi_intr_disable (struct cphy *phy) { -return t3_mdio_write (phy,MDIO_MMD_PMAPMD ,LASI_CTRL ,0 ); +return t3_mdio_write (phy,MDIO_MMD_PMAPMD ,MDIO_PMA_LASI_CTRL ,0 ); }int t3_phy_lasi_intr_clear (struct cphy *phy) {u32 val; -return t3_mdio_read (phy,MDIO_MMD_PMAPMD ,LASI_STAT , &val); +return t3_mdio_read (phy,MDIO_MMD_PMAPMD ,MDIO_PMA_LASI_STAT , &val); }int t3_phy_lasi_intr_handler (struct cphy *phy) {unsigned int status; -int err =t3_mdio_read (phy,MDIO_MMD_PMAPMD ,LASI_STAT , &status); +int err =t3_mdio_read (phy,MDIO_MMD_PMAPMD ,MDIO_PMA_LASI_STAT , + &status);if (err)return err; -return (status &1 ) ? cphy_cause_link_change :0 ; +return (status &MDIO_PMA_LASI_LSALARM ) ? cphy_cause_link_change :0 ; }static const struct adapter_info t3_adap_info[] = {
From: Divy Le Ray <[email protected]>
Date: Wed, 20 May 2009 18:52:19 -0700
Quoted 5 lines
Quoted 2 lines · Ben Hutchings
Signed-off-by Ben Hutchings <[email protected]>Acked-by Divy Le Ray <[email protected]>
Applied.