Commit c35eb3ae authored by Mark Einon's avatar Mark Einon Committed by Greg Kroah-Hartman

staging: et131x: Remove unnecessary PHY register write

The PHY registers are now being controlled from the connected phydev,
so there shouldn't be any reason for the et131x code to perform any
extra setup. Removing the interrupt setup code, and register defines
that are now unused.

On testing, no changes in behaviour were experienced.
Signed-off-by: default avatarMark Einon <mark.einon@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 186c426d
...@@ -1749,22 +1749,8 @@ static void et1310_phy_power_down(struct et131x_adapter *adapter, bool down) ...@@ -1749,22 +1749,8 @@ static void et1310_phy_power_down(struct et131x_adapter *adapter, bool down)
*/ */
static void et131x_xcvr_init(struct et131x_adapter *adapter) static void et131x_xcvr_init(struct et131x_adapter *adapter)
{ {
u16 imr;
u16 isr;
u16 lcr2; u16 lcr2;
et131x_mii_read(adapter, PHY_INTERRUPT_STATUS, &isr);
et131x_mii_read(adapter, PHY_INTERRUPT_MASK, &imr);
/* Set the link status interrupt only. Bad behavior when link status
* and auto neg are set, we run into a nested interrupt problem
*/
imr |= (ET_PHY_INT_MASK_AUTONEGSTAT |
ET_PHY_INT_MASK_LINKSTAT |
ET_PHY_INT_MASK_ENABLE);
et131x_mii_write(adapter, PHY_INTERRUPT_MASK, imr);
/* Set the LED behavior such that LED 1 indicates speed (off = /* Set the LED behavior such that LED 1 indicates speed (off =
* 10Mbits, blink = 100Mbits, on = 1000Mbits) and LED 2 indicates * 10Mbits, blink = 100Mbits, on = 1000Mbits) and LED 2 indicates
* link and activity (on for link, blink off for activity). * link and activity (on for link, blink off for activity).
......
...@@ -1538,10 +1538,6 @@ struct address_map { ...@@ -1538,10 +1538,6 @@ struct address_map {
* 0: int_en * 0: int_en
*/ */
#define ET_PHY_INT_MASK_AUTONEGSTAT 0x0100
#define ET_PHY_INT_MASK_LINKSTAT 0x0004
#define ET_PHY_INT_MASK_ENABLE 0x0001
/* MI Register 25: Interrupt Status Reg(0x19) /* MI Register 25: Interrupt Status Reg(0x19)
* 15-10: reserved * 15-10: reserved
* 9: mdio_sync_lost * 9: mdio_sync_lost
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment