On Wed, 16 Jan 2008 11:38:17 +0100 Stelian Pop <[EMAIL PROTECTED]> wrote:
> diff --git a/drivers/net/macb.c b/drivers/net/macb.c > index 6657d22..9c98338 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 c778e4e..83207e8 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 Cool, I always was curious about whether post-rm9200 AT91 chips could use this driver too. The changes you've done nicely match the Linux driver, so ACK on this part from me. If you had submitted one patch per driver (aka per logical change ;-) I could have acked a whole patch, not only part of it. If you need to resend, I recommend that you do that, and send them before the actual cpu- and board support; that way they can be applied independently as soon as each one is ready. We should probably get rid of the CONFIG_RMII symbol at some point, but that might as well go on top of this patch. Haavard ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ U-Boot-Users mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/u-boot-users
