diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-02-16 00:42:44 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-02-16 00:42:44 +0100 |
| commit | 5db6138565ad4da190f94e0bc1d89407d58a2ab2 (patch) | |
| tree | 349d78d6c9f4e3188df7edd3061361434af9cf71 /drivers/net | |
| parent | 30c6a241e88499f536e86d325759e29ba00ff67f (diff) | |
| parent | 5561857aae9a5921772b18b571708956788148d8 (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot-arm
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/macb.c | 8 | ||||
| -rw-r--r-- | drivers/net/macb.h | 6 |
2 files changed, 14 insertions, 0 deletions
diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 6657d22926..9c98338f74 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -417,10 +417,18 @@ static int macb_init(struct eth_device *netdev, bd_t *bd) /* choose RMII or MII mode. This depends on the board */ #ifdef CONFIG_RMII +#ifdef CONFIG_AT91CAP9ADK + macb_writel(macb, USRIO, MACB_BIT(RMII) | MACB_BIT(CLKEN)); +#else macb_writel(macb, USRIO, 0); +#endif +#else +#ifdef CONFIG_AT91CAP9ADK + macb_writel(macb, USRIO, MACB_BIT(CLKEN)); #else macb_writel(macb, USRIO, MACB_BIT(MII)); #endif +#endif /* CONFIG_RMII */ if (!macb_phy_init(macb)) return -1; diff --git a/drivers/net/macb.h b/drivers/net/macb.h index c778e4ee49..f92a20c701 100644 --- a/drivers/net/macb.h +++ b/drivers/net/macb.h @@ -222,6 +222,12 @@ #define MACB_TX_PAUSE_ZERO_OFFSET 3 #define MACB_TX_PAUSE_ZERO_SIZE 1 +/* Bitfields in USRIO (AT91) */ +#define MACB_RMII_OFFSET 0 +#define MACB_RMII_SIZE 1 +#define MACB_CLKEN_OFFSET 1 +#define MACB_CLKEN_SIZE 1 + /* Bitfields in WOL */ #define MACB_IP_OFFSET 0 #define MACB_IP_SIZE 16 |