aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Blumenstingl <martin.blumenstingl@googlemail.com>2016-01-14 19:55:23 -0500
committerDavid S. Miller <davem@davemloft.net>2016-01-17 19:16:46 -0500
commita46bd63bc13b2190b343706d78deab220d5c4d45 (patch)
tree99f2f94e20b91ea3756860e596b9a556d60d7340
parent2e5f9f281ee8369f56d403b4a52942f19b6978f8 (diff)
net: phy: at803x: Clean up duplicate register definitions
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/phy/at803x.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
index 333c1bc79929..f2c4e8df833c 100644
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
@@ -20,9 +20,12 @@
20#include <linux/gpio/consumer.h> 20#include <linux/gpio/consumer.h>
21 21
22#define AT803X_INTR_ENABLE 0x12 22#define AT803X_INTR_ENABLE 0x12
23#define AT803X_INTR_ENABLE_INIT 0xec00
23#define AT803X_INTR_STATUS 0x13 24#define AT803X_INTR_STATUS 0x13
25
24#define AT803X_SMART_SPEED 0x14 26#define AT803X_SMART_SPEED 0x14
25#define AT803X_LED_CONTROL 0x18 27#define AT803X_LED_CONTROL 0x18
28
26#define AT803X_WOL_ENABLE 0x01 29#define AT803X_WOL_ENABLE 0x01
27#define AT803X_DEVICE_ADDR 0x03 30#define AT803X_DEVICE_ADDR 0x03
28#define AT803X_LOC_MAC_ADDR_0_15_OFFSET 0x804C 31#define AT803X_LOC_MAC_ADDR_0_15_OFFSET 0x804C
@@ -31,13 +34,13 @@
31#define AT803X_MMD_ACCESS_CONTROL 0x0D 34#define AT803X_MMD_ACCESS_CONTROL 0x0D
32#define AT803X_MMD_ACCESS_CONTROL_DATA 0x0E 35#define AT803X_MMD_ACCESS_CONTROL_DATA 0x0E
33#define AT803X_FUNC_DATA 0x4003 36#define AT803X_FUNC_DATA 0x4003
34#define AT803X_INER 0x0012 37
35#define AT803X_INER_INIT 0xec00
36#define AT803X_INSR 0x0013
37#define AT803X_DEBUG_ADDR 0x1D 38#define AT803X_DEBUG_ADDR 0x1D
38#define AT803X_DEBUG_DATA 0x1E 39#define AT803X_DEBUG_DATA 0x1E
40
39#define AT803X_DEBUG_REG_0 0x00 41#define AT803X_DEBUG_REG_0 0x00
40#define AT803X_DEBUG_RX_CLK_DLY_EN BIT(15) 42#define AT803X_DEBUG_RX_CLK_DLY_EN BIT(15)
43
41#define AT803X_DEBUG_REG_5 0x05 44#define AT803X_DEBUG_REG_5 0x05
42#define AT803X_DEBUG_TX_CLK_DLY_EN BIT(8) 45#define AT803X_DEBUG_TX_CLK_DLY_EN BIT(8)
43 46
@@ -280,7 +283,7 @@ static int at803x_ack_interrupt(struct phy_device *phydev)
280{ 283{
281 int err; 284 int err;
282 285
283 err = phy_read(phydev, AT803X_INSR); 286 err = phy_read(phydev, AT803X_INTR_STATUS);
284 287
285 return (err < 0) ? err : 0; 288 return (err < 0) ? err : 0;
286} 289}
@@ -290,13 +293,13 @@ static int at803x_config_intr(struct phy_device *phydev)
290 int err; 293 int err;
291 int value; 294 int value;
292 295
293 value = phy_read(phydev, AT803X_INER); 296 value = phy_read(phydev, AT803X_INTR_ENABLE);
294 297
295 if (phydev->interrupts == PHY_INTERRUPT_ENABLED) 298 if (phydev->interrupts == PHY_INTERRUPT_ENABLED)
296 err = phy_write(phydev, AT803X_INER, 299 err = phy_write(phydev, AT803X_INTR_ENABLE,
297 value | AT803X_INER_INIT); 300 value | AT803X_INTR_ENABLE_INIT);
298 else 301 else
299 err = phy_write(phydev, AT803X_INER, 0); 302 err = phy_write(phydev, AT803X_INTR_ENABLE, 0);
300 303
301 return err; 304 return err;
302} 305}