summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorRafal Jaworowski <raj@FreeBSD.org>2009-09-16 12:07:58 +0000
committerRafal Jaworowski <raj@FreeBSD.org>2009-09-16 12:07:58 +0000
commite9667e8ff118a1ab0a9d36fce68a055e8d9aad7f (patch)
tree4cc537c1f36308e1362f01aa78a500b129ccca90 /sys/dev
parent553a7dec4b4e11bbb3257f5daa92ce594740fedc (diff)
Notes
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/mge/if_mge.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/sys/dev/mge/if_mge.c b/sys/dev/mge/if_mge.c
index ff505e986373..0188ae3b79f8 100644
--- a/sys/dev/mge/if_mge.c
+++ b/sys/dev/mge/if_mge.c
@@ -69,7 +69,9 @@ __FBSDID("$FreeBSD$");
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
-#define MV_PHY_ADDR_BASE 8
+#ifndef MII_ADDR_BASE
+#define MII_ADDR_BASE 8
+#endif
#include <dev/mge/if_mgevar.h>
#include <arm/mv/mvreg.h>
@@ -1264,14 +1266,15 @@ mge_miibus_readreg(device_t dev, int phy, int reg)
/*
* We assume static PHY address <=> device unit mapping:
- * PHY Address = MV_PHY_ADDR_BASE + devce unit.
+ * PHY Address = MII_ADDR_BASE + devce unit.
* This is true for most Marvell boards.
*
* Code below grants proper PHY detection on each device
* unit.
*/
- if ((MV_PHY_ADDR_BASE + device_get_unit(dev)) != phy)
+
+ if ((MII_ADDR_BASE + device_get_unit(dev)) != phy)
return (0);
MGE_WRITE(sc_mge0, MGE_REG_SMI, 0x1fffffff &
@@ -1292,7 +1295,7 @@ mge_miibus_writereg(device_t dev, int phy, int reg, int value)
{
uint32_t retries;
- if ((MV_PHY_ADDR_BASE + device_get_unit(dev)) != phy)
+ if ((MII_ADDR_BASE + device_get_unit(dev)) != phy)
return (0);
MGE_WRITE(sc_mge0, MGE_REG_SMI, 0x1fffffff &