ppc4xx: Add missing APC405 to MAKEALL

[oweals/u-boot.git] / board / cmc_pu2 / cmc_pu2.c

diff --git a/board/cmc_pu2/cmc_pu2.c b/board/cmc_pu2/cmc_pu2.c
index 8e0f6d3b739c5de5c08271c6475210045fc4f97e..0ac851c97f3e9270861733660722cfc86905991b 100644 (file)
--- a/board/cmc_pu2/cmc_pu2.c
+++ b/board/cmc_pu2/cmc_pu2.c
@@ -30,19 +30,27 @@
 #include <common.h>
 #include <asm/mach-types.h>
 #include <asm/arch/AT91RM9200.h>
+#include <asm/io.h>
+#include <netdev.h>
+#if defined(CONFIG_DRIVER_ETHER)
+#include <at91rm9200_net.h>
+#include <dm9161.h>
+#endif
+
+DECLARE_GLOBAL_DATA_PTR;
 
 /* ------------------------------------------------------------------------- */
 /*
  * Miscelaneous platform dependent initialisations
  */
-#define CMC_BASIC      1
+#define CMC_HP_BASIC   1
 #define CMC_PU2                2
+#define CMC_BASIC      4
 
 int hw_detect (void);
 
 int board_init (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
        AT91PS_PIO piob = AT91C_BASE_PIOB;
        AT91PS_PIO pioc = AT91C_BASE_PIOC;
 
@@ -69,19 +77,19 @@ int board_init (void)
        pioc->PIO_PPUDR = AT91C_PIO_PC0 | AT91C_PIO_PC1 |
                        AT91C_PIO_PC2 | AT91C_PIO_PC3;
        pioc->PIO_PER = AT91C_PIO_PC0 | AT91C_PIO_PC1 |
-                       AT91C_PIO_PC2 | AT91C_PIO_PC3;
+                       AT91C_PIO_PC2 | AT91C_PIO_PC3;
 
        /*
         * On CMC-PU2 board configure PB3-PB6 to input without pull ups to
         * clear the duo LEDs (the external pull downs assure a proper
-        * signal). On CMC-BASIC set PB3-PB6 to output and drive it
-        * high, to configure current meassurement on AINx.
+        * signal). On CMC-BASIC and CMC-HP-BASIC set PB3-PB6 to output and
+        * drive it high, to configure current measurement on AINx.
         */
        if (hw_detect() & CMC_PU2) {
                piob->PIO_ODR = AT91C_PIO_PB3 | AT91C_PIO_PB4 |
                                AT91C_PIO_PB5 | AT91C_PIO_PB6;
        }
-       else if (hw_detect() & CMC_BASIC) {
+       else if ((hw_detect() & CMC_BASIC) || (hw_detect() & CMC_HP_BASIC)) {
                piob->PIO_SODR = AT91C_PIO_PB3 | AT91C_PIO_PB4 |
                                AT91C_PIO_PB5 | AT91C_PIO_PB6;
                piob->PIO_OER = AT91C_PIO_PB3 | AT91C_PIO_PB4 |
@@ -106,8 +114,6 @@ int board_init (void)
 
 int dram_init (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        gd->bd->bi_dram[0].start = PHYS_SDRAM;
        gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE;
        return 0;
@@ -119,6 +125,8 @@ int checkboard (void)
                puts ("Board: CMC-PU2 (Rittal GmbH)\n");
        else if (hw_detect() & CMC_BASIC)
                puts ("Board: CMC-BASIC (Rittal GmbH)\n");
+       else if (hw_detect() & CMC_HP_BASIC)
+               puts ("Board: CMC-HP-BASIC (Rittal GmbH)\n");
        else
                puts ("Board: unknown\n");
        return 0;
@@ -136,6 +144,49 @@ int hw_detect (void)
        pio->PIO_PPUDR = AT91C_PIO_PB12;
        pio->PIO_PER = AT91C_PIO_PB12;
 
+       /* configure PB13 as input without pull up */
+       pio->PIO_ODR = AT91C_PIO_PB13;
+       pio->PIO_PPUDR = AT91C_PIO_PB13;
+       pio->PIO_PER = AT91C_PIO_PB13;
+
        /* read board identification pin */
-       return ((pio->PIO_PDSR & AT91C_PIO_PB12) ? CMC_PU2 : CMC_BASIC);
+       if (pio->PIO_PDSR & AT91C_PIO_PB12)
+               return ((pio->PIO_PDSR & AT91C_PIO_PB13)
+                       ? CMC_PU2 : 0);
+       else
+               return ((pio->PIO_PDSR & AT91C_PIO_PB13)
+                       ? CMC_HP_BASIC : CMC_BASIC);
+}
+
+#ifdef CONFIG_DRIVER_ETHER
+#if defined(CONFIG_CMD_NET)
+
+/*
+ * Name:
+ *     at91rm9200_GetPhyInterface
+ * Description:
+ *     Initialise the interface functions to the PHY
+ * Arguments:
+ *     None
+ * Return value:
+ *     None
+ */
+void at91rm9200_GetPhyInterface(AT91PS_PhyOps p_phyops)
+{
+       p_phyops->Init = dm9161_InitPhy;
+       p_phyops->IsPhyConnected = dm9161_IsPhyConnected;
+       p_phyops->GetLinkSpeed = dm9161_GetLinkSpeed;
+       p_phyops->AutoNegotiate = dm9161_AutoNegotiate;
+}
+
+#endif
+#endif /* CONFIG_DRIVER_ETHER */
+
+#ifdef CONFIG_DRIVER_AT91EMAC
+int board_eth_init(bd_t *bis)
+{
+       int rc = 0;
+       rc = at91emac_register(bis, 0);
+       return rc;
 }
+#endif