Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net: macb: using AT91FAMILY replace #ifdeferry

Browse Source 
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>
master
Bo Shen 12 years ago committed by Joe Hershberger
parent 162762205f
commit d8f64b4441
1 changed files with 2 additions and 8 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 10
      drivers/net/macb.c

10
drivers/net/macb.c
Unescape View File

@ -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 */ /* choose RMII or MII mode. This depends on the board */
#ifdef CONFIG_RMII #ifdef CONFIG_RMII
#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \ #ifdef CONFIG_AT91FAMILY
defined(CONFIG_AT91SAM9263) || defined(CONFIG_AT91SAM9G20) || \
defined(CONFIG_AT91SAM9G45) || defined(CONFIG_AT91SAM9M10G45) || \
defined(CONFIG_AT91SAM9XE) || defined(CONFIG_AT91SAM9X5)
macb_writel(macb, USRIO, MACB_BIT(RMII) | MACB_BIT(CLKEN)); macb_writel(macb, USRIO, MACB_BIT(RMII) | MACB_BIT(CLKEN));
#else #else
macb_writel(macb, USRIO, 0); macb_writel(macb, USRIO, 0);
#endif #endif
#else #else
#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \ #ifdef CONFIG_AT91FAMILY
defined(CONFIG_AT91SAM9263) || defined(CONFIG_AT91SAM9G20) || \
defined(CONFIG_AT91SAM9G45) || defined(CONFIG_AT91SAM9M10G45) || \
defined(CONFIG_AT91SAM9XE) || defined(CONFIG_AT91SAM9X5)
macb_writel(macb, USRIO, MACB_BIT(CLKEN)); macb_writel(macb, USRIO, MACB_BIT(CLKEN));
#else #else
macb_writel(macb, USRIO, MACB_BIT(MII)); macb_writel(macb, USRIO, MACB_BIT(MII));

Write Preview
Loading…
Cancel
Save