diff options
| author | Huang, Xiong <xiong@qca.qualcomm.com> | 2012-04-25 20:27:09 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-26 05:03:32 -0400 |
| commit | 8f33ab913456654b2bfc75b90893dce9561cab9a (patch) | |
| tree | 9554718df6abba1202d1b6bb37d9c808f850636f /drivers | |
| parent | c165541efc4d1024d7db22ecdf64359b1f6107fc (diff) | |
| download | linux-3.10-8f33ab913456654b2bfc75b90893dce9561cab9a.tar.gz linux-3.10-8f33ab913456654b2bfc75b90893dce9561cab9a.tar.bz2 linux-3.10-8f33ab913456654b2bfc75b90893dce9561cab9a.zip | |
atl1c: remove REG_PHY_STATUS
this register is used for l1e(dev=1026)
l1c/l1d/l2cb don't use it.
Signed-off-by: xiong <xiong@qca.qualcomm.com>
Tested-by: Liu David <dwliu@qca.qualcomm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/atheros/atl1c/atl1c_hw.h | 7 | ||||
| -rw-r--r-- | drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 2 |
2 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_hw.h b/drivers/net/ethernet/atheros/atl1c/atl1c_hw.h index cc7afa1a8fb..459e141f002 100644 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_hw.h +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_hw.h @@ -293,13 +293,6 @@ int atl1c_phy_power_saving(struct atl1c_hw *hw); #define MDIO_AP_EN 0x10000000 #define MDIO_WAIT_TIMES 10 -/* MII PHY Status Register */ -#define REG_PHY_STATUS 0x1418 -#define PHY_GENERAL_STATUS_MASK 0xFFFF -#define PHY_STATUS_RECV_ENABLE 0x0001 -#define PHY_OE_PWSP_STATUS_MASK 0x07FF -#define PHY_OE_PWSP_STATUS_SHIFT 16 -#define PHY_STATUS_LPW_STATE 0x80000000 /* BIST Control and Status Register0 (for the Packet Memory) */ #define REG_BIST0_CTRL 0x141c #define BIST0_NOW 0x1 diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c index df106370eb6..a6c3f05e5db 100644 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c @@ -699,11 +699,9 @@ static void atl1c_set_mac_type(struct atl1c_hw *hw) static int atl1c_setup_mac_funcs(struct atl1c_hw *hw) { - u32 phy_status_data; u32 link_ctrl_data; atl1c_set_mac_type(hw); - AT_READ_REG(hw, REG_PHY_STATUS, &phy_status_data); AT_READ_REG(hw, REG_LINK_CTRL, &link_ctrl_data); hw->ctrl_flags = ATL1C_INTR_MODRT_ENABLE | |