ARM DaVinci: Move common functions to board/davinci/common

[platform/kernel/u-boot.git] / board / davinci / dv-evm / dv_board.c

diff --git a/board/davinci/dv-evm/dv_board.c b/board/davinci/dv-evm/dv_board.c
index 834eb68..151f8a9 100644 (file)
--- a/board/davinci/dv-evm/dv_board.c
+++ b/board/davinci/dv-evm/dv_board.c
@@ -28,89 +28,11 @@
 #include <i2c.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/emac_defs.h>
+#include "../common/psc.h"
+#include "../common/misc.h"
 
 DECLARE_GLOBAL_DATA_PTR;
 
-extern void    timer_init(void);
-extern int     eth_hw_init(void);
-
-
-/* Works on Always On power domain only (no PD argument) */
-void lpsc_on(unsigned int id)
-{
-       dv_reg_p        mdstat, mdctl;
-
-       if (id >= DAVINCI_LPSC_GEM)
-               return;                 /* Don't work on DSP Power Domain */
-
-       mdstat = REG_P(PSC_MDSTAT_BASE + (id * 4));
-       mdctl = REG_P(PSC_MDCTL_BASE + (id * 4));
-
-       while (REG(PSC_PTSTAT) & 0x01) {;}
-
-       if ((*mdstat & 0x1f) == 0x03)
-               return;                 /* Already on and enabled */
-
-       *mdctl |= 0x03;
-
-       /* Special treatment for some modules as for sprue14 p.7.4.2 */
-       if (    (id == DAVINCI_LPSC_VPSSSLV) ||
-               (id == DAVINCI_LPSC_EMAC) ||
-               (id == DAVINCI_LPSC_EMAC_WRAPPER) ||
-               (id == DAVINCI_LPSC_MDIO) ||
-               (id == DAVINCI_LPSC_USB) ||
-               (id == DAVINCI_LPSC_ATA) ||
-               (id == DAVINCI_LPSC_VLYNQ) ||
-               (id == DAVINCI_LPSC_UHPI) ||
-               (id == DAVINCI_LPSC_DDR_EMIF) ||
-               (id == DAVINCI_LPSC_AEMIF) ||
-               (id == DAVINCI_LPSC_MMC_SD) ||
-               (id == DAVINCI_LPSC_MEMSTICK) ||
-               (id == DAVINCI_LPSC_McBSP) ||
-               (id == DAVINCI_LPSC_GPIO)
-          )
-               *mdctl |= 0x200;
-
-       REG(PSC_PTCMD) = 0x01;
-
-       while (REG(PSC_PTSTAT) & 0x03) {;}
-       while ((*mdstat & 0x1f) != 0x03) {;}    /* Probably an overkill... */
-}
-
-void dsp_on(void)
-{
-       int     i;
-
-       if (REG(PSC_PDSTAT1) & 0x1f)
-               return;                 /* Already on */
-
-       REG(PSC_GBLCTL) |= 0x01;
-       REG(PSC_PDCTL1) |= 0x01;
-       REG(PSC_PDCTL1) &= ~0x100;
-       REG(PSC_MDCTL_BASE + (DAVINCI_LPSC_GEM * 4)) |= 0x03;
-       REG(PSC_MDCTL_BASE + (DAVINCI_LPSC_GEM * 4)) &= 0xfffffeff;
-       REG(PSC_MDCTL_BASE + (DAVINCI_LPSC_IMCOP * 4)) |= 0x03;
-       REG(PSC_MDCTL_BASE + (DAVINCI_LPSC_IMCOP * 4)) &= 0xfffffeff;
-       REG(PSC_PTCMD) = 0x02;
-
-       for (i = 0; i < 100; i++) {
-               if (REG(PSC_EPCPR) & 0x02)
-                       break;
-       }
-
-       REG(PSC_CHP_SHRTSW) = 0x01;
-       REG(PSC_PDCTL1) |= 0x100;
-       REG(PSC_EPCCR) = 0x02;
-
-       for (i = 0; i < 100; i++) {
-               if (!(REG(PSC_PTSTAT) & 0x02))
-                       break;
-       }
-
-       REG(PSC_GBLCTL) &= ~0x1f;
-}
-
-
 int board_init(void)
 {
        /* arch number of the board */
@@ -131,8 +53,10 @@ int board_init(void)
        lpsc_on(DAVINCI_LPSC_TIMER1);
        lpsc_on(DAVINCI_LPSC_GPIO);
 
+#if !defined(CFG_USE_DSPLINK)
        /* Powerup the DSP */
        dsp_on();
+#endif /* CFG_USE_DSPLINK */
 
        /* Bringup UART0 out of reset */
        REG(UART0_PWREMU_MGMT) = 0x0000e003;
@@ -157,46 +81,23 @@ int board_init(void)
        return(0);
 }
 
-int misc_init_r (void)
+int misc_init_r(void)
 {
-       u_int8_t        tmp[20], buf[10];
-       int             i = 0;
-       int             clk = 0;
-
-       clk = ((REG(PLL2_PLLM) + 1) * 27) / ((REG(PLL2_DIV2) & 0x1f) + 1);
-
-       printf ("ARM Clock : %dMHz\n", ((REG(PLL1_PLLM) + 1) * 27 ) / 2);
-       printf ("DDR Clock : %dMHz\n", (clk / 2));
-
-       /* Set Ethernet MAC address from EEPROM */
-       if (i2c_read(CFG_I2C_EEPROM_ADDR, 0x7f00, CFG_I2C_EEPROM_ADDR_LEN, buf, 6)) {
-               printf("\nEEPROM @ 0x%02x read FAILED!!!\n", CFG_I2C_EEPROM_ADDR);
-       } else {
-               tmp[0] = 0xff;
-               for (i = 0; i < 6; i++)
-                       tmp[0] &= buf[i];
-
-               if ((tmp[0] != 0xff) && (getenv("ethaddr") == NULL)) {
-                       sprintf((char *)&tmp[0], "%02x:%02x:%02x:%02x:%02x:%02x",
-                               buf[0], buf[1], buf[2], buf[3], buf[4], buf[5]);
-                       setenv("ethaddr", (char *)&tmp[0]);
-               }
-       }
+       uint8_t video_mode;
+       uint8_t eeprom_enetaddr[6];
 
-       if (!eth_hw_init())
-               printf("ethernet init failed!\n");
+       dv_display_clk_infos();
 
-       i2c_read (0x39, 0x00, 1, (u_int8_t *)&i, 1);
+       /* Read Ethernet MAC address from EEPROM if available. */
+       if (dvevm_read_mac_address(eeprom_enetaddr))
+               dv_configure_mac_address(eeprom_enetaddr);
 
-       setenv ("videostd", ((i  & 0x80) ? "pal" : "ntsc"));
+       if (!eth_hw_init())
+               printf("ethernet init failed!\n");
 
-       return(0);
-}
+       i2c_read(0x39, 0x00, 1, &video_mode, 1);
 
-int dram_init(void)
-{
-       gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
-       gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
+       setenv("videostd", ((video_mode & 0x80) ? "pal" : "ntsc"));
 
        return(0);
 }