summaryrefslogtreecommitdiffstats
path: root/drivers/net/macb.c
diff options
context:
space:
mode:
authorBo Shen <voice.shen@atmel.com>2013-04-24 15:59:26 +0800
committerJoe Hershberger <joe.hershberger@ni.com>2013-06-24 19:11:15 -0500
commitd8f64b444191d9f3ea724317e6520643c48e3117 (patch)
treee71078445b8c413773bc5867c8bff1eda70f8078 /drivers/net/macb.c
parent162762205fa997bf27dded8597904052571a803b (diff)
downloadtalos-obmc-uboot-d8f64b444191d9f3ea724317e6520643c48e3117.tar.gz
talos-obmc-uboot-d8f64b444191d9f3ea724317e6520643c48e3117.zip
net: macb: using AT91FAMILY replace #ifdeferry
Using CONFIG_AT91FAMILY replace #ifdeferry for atmel SoC Signed-off-by: Bo Shen <voice.shen@atmel.com> Acked-by: Andreas Bießmann <andreas.devel@googlemail.com>
Diffstat (limited to 'drivers/net/macb.c')
-rw-r--r--drivers/net/macb.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 81a734d874..ac2872074c 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -474,19 +474,13 @@ static int macb_init(struct eth_device *netdev, bd_t *bd)
/* choose RMII or MII mode. This depends on the board */
#ifdef CONFIG_RMII
-#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \
- defined(CONFIG_AT91SAM9263) || defined(CONFIG_AT91SAM9G20) || \
- defined(CONFIG_AT91SAM9G45) || defined(CONFIG_AT91SAM9M10G45) || \
- defined(CONFIG_AT91SAM9XE) || defined(CONFIG_AT91SAM9X5)
+#ifdef CONFIG_AT91FAMILY
macb_writel(macb, USRIO, MACB_BIT(RMII) | MACB_BIT(CLKEN));
#else
macb_writel(macb, USRIO, 0);
#endif
#else
-#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \
- defined(CONFIG_AT91SAM9263) || defined(CONFIG_AT91SAM9G20) || \
- defined(CONFIG_AT91SAM9G45) || defined(CONFIG_AT91SAM9M10G45) || \
- defined(CONFIG_AT91SAM9XE) || defined(CONFIG_AT91SAM9X5)
+#ifdef CONFIG_AT91FAMILY
macb_writel(macb, USRIO, MACB_BIT(CLKEN));
#else
macb_writel(macb, USRIO, MACB_BIT(MII));
OpenPOWER on IntegriCloud