Merge branch 'master' of git://git.denx.de/u-boot

[u-boot] / board / freescale / mx31pdk / mx31pdk.c

diff --git a/board/freescale/mx31pdk/mx31pdk.c b/board/freescale/mx31pdk/mx31pdk.c
index 9f471692dd9f695dec5ac6b7d9abb7a100e8cf3d..895396cd6231ce037493629f8742c70598ba7ef0 100644 (file)
--- a/board/freescale/mx31pdk/mx31pdk.c
+++ b/board/freescale/mx31pdk/mx31pdk.c
@@ -26,40 +26,79 @@
 
 #include <common.h>
 #include <netdev.h>
-#include <asm/arch/mx31.h>
-#include <asm/arch/mx31-regs.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/sys_proto.h>
+#include <watchdog.h>
+#include <power/pmic.h>
+#include <fsl_pmic.h>
+#include <errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
 int dram_init(void)
 {
-       gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
-       gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
-
+       /* dram_init must store complete ramsize in gd->ram_size */
+       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
+                               PHYS_SDRAM_1_SIZE);
        return 0;
 }
 
-int board_init(void)
+int board_early_init_f(void)
 {
        /* CS5: CPLD incl. network controller */
-       __REG(CSCR_U(5)) = 0x0000d843;
-       __REG(CSCR_L(5)) = 0x22252521;
-       __REG(CSCR_A(5)) = 0x22220a00;
+       static const struct mxc_weimcs cs5 = {
+               /*    sp wp bcd bcs psz pme sync dol cnc wsc ew wws edc */
+               CSCR_U(0, 0,  0,  0,  0,  0,   0,  0,  3, 24, 0,  4,  3),
+               /*   oea oen ebwa ebwn csa ebc dsz csn psr cre wrap csen */
+               CSCR_L(2,  2,   2,   5,  2,  0,  5,  2,  0,  0,   0,   1),
+               /*  ebra ebrn rwa rwn mum lah lbn lba dww dct wwu age cnc2 fce*/
+               CSCR_A(2,   2,  2,  2,  0,  0,  2,  2,  0,  0,  0,  0,   0,  0)
+       };
+
+       mxc_setup_weimcs(5, &cs5);
 
        /* Setup UART1 and SPI2 pins */
        mx31_uart1_hw_init();
        mx31_spi2_hw_init();
 
-       gd->bd->bi_arch_number = MACH_TYPE_MX31_3DS; /* board id for linux */
+       return 0;
+}
+
+int board_init(void)
+{
        /* adress of boot parameters */
        gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
 
        return 0;
 }
 
+int board_late_init(void)
+{
+       u32 val;
+       struct pmic *p;
+       int ret;
+
+       ret = pmic_init(I2C_PMIC);
+       if (ret)
+               return ret;
+
+       p = pmic_get("FSL_PMIC");
+       if (!p)
+               return -ENODEV;
+       /* Enable RTC battery */
+       pmic_reg_read(p, REG_POWER_CTL0, &val);
+       pmic_reg_write(p, REG_POWER_CTL0, val | COINCHEN);
+       pmic_reg_write(p, REG_INT_STATUS1, RTCRSTI);
+#ifdef CONFIG_HW_WATCHDOG
+       hw_watchdog_init();
+#endif
+       return 0;
+}
+
 int checkboard(void)
 {
-       printf("Board: i.MX31 MAX PDK (3DS)\n");
+       printf("Board: MX31PDK\n");
        return 0;
 }