* Patch by Masami Komiya, 30 Mar 2005:

[people/ms/u-boot.git] / cpu / at91rm9200 / at91rm9200_ether.c

diff --git a/cpu/at91rm9200/at91rm9200_ether.c b/cpu/at91rm9200/at91rm9200_ether.c
index b6247c92e3093a7de88ca0893e73360bab07d559..2ec888f213fff102cc54686800827762c1a4c540 100644 (file)
--- a/cpu/at91rm9200/at91rm9200_ether.c
+++ b/cpu/at91rm9200/at91rm9200_ether.c
@@ -169,14 +169,16 @@ int eth_init (bd_t * bd)
                          AT91C_PA10_ETX1 | AT91C_PA9_ETX0 | AT91C_PA8_ETXEN |
                          AT91C_PA7_ETXCK_EREFCK;
 
-#if defined(CONFIG_AT91C_USE_RMII) && !defined(CONFIG_CMC_PU2)
-       *AT91C_PIOB_PDR = AT91C_PB25_EF100 |
-                         AT91C_PB19_ERXCK | AT91C_PB18_ECOL | AT91C_PB17_ERXDV |
+#ifdef CONFIG_AT91C_USE_RMII
+       *AT91C_PIOB_PDR = AT91C_PB19_ERXCK;
+       *AT91C_PIOB_BSR = AT91C_PB19_ERXCK;
+#else
+       *AT91C_PIOB_PDR = AT91C_PB19_ERXCK | AT91C_PB18_ECOL | AT91C_PB17_ERXDV |
                          AT91C_PB16_ERX3 | AT91C_PB15_ERX2 | AT91C_PB14_ETXER |
                          AT91C_PB13_ETX3 | AT91C_PB12_ETX2;
 
        /* Select B Register */
-       *AT91C_PIOB_BSR = AT91C_PB25_EF100 | AT91C_PB19_ERXCK | AT91C_PB18_ECOL |
+       *AT91C_PIOB_BSR = AT91C_PB19_ERXCK | AT91C_PB18_ECOL |
                          AT91C_PB17_ERXDV | AT91C_PB16_ERX3 | AT91C_PB15_ERX2 |
                          AT91C_PB14_ETXER | AT91C_PB13_ETX3 | AT91C_PB12_ETX2;
 #endif