diff options
| author | Josh Wu <josh.wu@atmel.com> | 2012-10-22 15:49:04 +0800 |
|---|---|---|
| committer | Josh Wu <josh.wu@atmel.com> | 2012-10-22 15:49:04 +0800 |
| commit | d09dc68d74844b44b89a1311f60055351952fb0e (patch) | |
| tree | 6d4bf5d6962bfa3c5d4597d8fbcdb7e2fd840266 /drivers/net/macb.c | |
| parent | 6528ff0109d81c1f21d20f9f1370782bccf87bcb (diff) | |
| parent | 3cda03c7fa4413eef2ee250b5936a88c25dbc1be (diff) | |
Merge branch 'josh/sama5ek/v2012.10-rc1' into josh/sama5ek/v2012.10
Conflicts:
drivers/mtd/spi/atmel.c
Diffstat (limited to 'drivers/net/macb.c')
| -rw-r--r-- | drivers/net/macb.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 0e1ced71c50..f05a5665210 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -471,7 +471,8 @@ static int macb_init(struct eth_device *netdev, bd_t *bd) #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) + defined(CONFIG_AT91SAM9XE) || defined(CONFIG_AT91SAM9X5) || \ + defined(CONFIG_AT91SAMA5) macb_writel(macb, USRIO, MACB_BIT(RMII) | MACB_BIT(CLKEN)); #else macb_writel(macb, USRIO, 0); @@ -480,7 +481,8 @@ static int macb_init(struct eth_device *netdev, bd_t *bd) #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) + defined(CONFIG_AT91SAM9XE) || defined(CONFIG_AT91SAM9X5) || \ + defined(CONFIG_AT91SAMA5) macb_writel(macb, USRIO, MACB_BIT(CLKEN)); #else macb_writel(macb, USRIO, MACB_BIT(MII)); |