aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/atheros/atl1c/atl1c_hw.h7
-rw-r--r--drivers/net/ethernet/atheros/atl1c/atl1c_main.c2
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);
293#define MDIO_AP_EN 0x10000000 293#define MDIO_AP_EN 0x10000000
294#define MDIO_WAIT_TIMES 10 294#define MDIO_WAIT_TIMES 10
295 295
296/* MII PHY Status Register */
297#define REG_PHY_STATUS 0x1418
298#define PHY_GENERAL_STATUS_MASK 0xFFFF
299#define PHY_STATUS_RECV_ENABLE 0x0001
300#define PHY_OE_PWSP_STATUS_MASK 0x07FF
301#define PHY_OE_PWSP_STATUS_SHIFT 16
302#define PHY_STATUS_LPW_STATE 0x80000000
303/* BIST Control and Status Register0 (for the Packet Memory) */ 296/* BIST Control and Status Register0 (for the Packet Memory) */
304#define REG_BIST0_CTRL 0x141c 297#define REG_BIST0_CTRL 0x141c
305#define BIST0_NOW 0x1 298#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)
699 699
700static int atl1c_setup_mac_funcs(struct atl1c_hw *hw) 700static int atl1c_setup_mac_funcs(struct atl1c_hw *hw)
701{ 701{
702 u32 phy_status_data;
703 u32 link_ctrl_data; 702 u32 link_ctrl_data;
704 703
705 atl1c_set_mac_type(hw); 704 atl1c_set_mac_type(hw);
706 AT_READ_REG(hw, REG_PHY_STATUS, &phy_status_data);
707 AT_READ_REG(hw, REG_LINK_CTRL, &link_ctrl_data); 705 AT_READ_REG(hw, REG_LINK_CTRL, &link_ctrl_data);
708 706
709 hw->ctrl_flags = ATL1C_INTR_MODRT_ENABLE | 707 hw->ctrl_flags = ATL1C_INTR_MODRT_ENABLE |