fdt: Add fdtdec_find_aliases() to deal with alias nodes

[u-boot] / board / logicpd / imx31_litekit / imx31_litekit.c

diff --git a/board/logicpd/imx31_litekit/imx31_litekit.c b/board/logicpd/imx31_litekit/imx31_litekit.c
index 2ac622dbbe33954bc3cf3748a31ebf14b5355631..b038e0d8870775216a487ff1ff27426a6a223a80 100644 (file)
--- a/board/logicpd/imx31_litekit/imx31_litekit.c
+++ b/board/logicpd/imx31_litekit/imx31_litekit.c
@@ -24,28 +24,44 @@
 
 #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>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-int dram_init (void)
+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 *)PHYS_SDRAM_1,
+                               PHYS_SDRAM_1_SIZE);
        return 0;
 }
 
-int board_init (void)
+int board_early_init_f(void)
 {
-       __REG(CSCR_U(0)) = 0x0000cf03; /* CS0: Nor Flash */
-       __REG(CSCR_L(0)) = 0xa0330d01;
-       __REG(CSCR_A(0)) = 0x00220800;
+       /* CS0: Nor Flash */
+       static const struct mxc_weimcs cs0 = {
+               /*    sp wp bcd bcs psz pme sync dol cnc wsc ew wws edc */
+               CSCR_U(0, 0,  0,  0,  0,  0,   0,  0,  3, 15, 0,  0,  3),
+               /*    oea oen ebwa ebwn csa ebc dsz csn psr cre wrap csen */
+               CSCR_L(10,  0,   3,   3,  0,  1,  5,  0,  0,  0,   0,   1),
+               /*  ebra ebrn rwa rwn mum lah lbn lba dww dct wwu age cnc2 fce*/
+               CSCR_A(0,   0,  2,  2,  0,  0,  2,  0,  0,  0,  0,  0,   0,  0)
+       };
+
+       /* CS4: Network Controller */
+       static const struct mxc_weimcs cs4 = {
+               /*    sp wp bcd bcs psz pme sync dol cnc wsc ew wws edc */
+               CSCR_U(0, 0,  0,  0,  0,  0,   0,  0,  3, 28, 1,  7,  6),
+               /*   oea oen ebwa ebwn csa ebc dsz csn psr cre wrap csen */
+               CSCR_L(4,  4,   4,  10,  4,  0,  5,  4,  0,  0,   0,   1),
+               /*  ebra ebrn rwa rwn mum lah lbn lba dww dct wwu age cnc2 fce*/
+               CSCR_A(4,   4,  4,  4,  0,  1,  4,  3,  0,  0,  0,  0,   1,  0)
+       };
 
-       __REG(CSCR_U(4)) = 0x0000dcf6; /* CS4: Network Controller */
-       __REG(CSCR_L(4)) = 0x444a4541;
-       __REG(CSCR_A(4)) = 0x44443302;
+       mxc_setup_weimcs(0, &cs0);
+       mxc_setup_weimcs(4, &cs4);
 
        /* setup pins for UART1 */
        mx31_gpio_mux(MUX_RXD1__UART1_RXD_MUX);
@@ -65,13 +81,17 @@ int board_init (void)
        /* start SPI2 clock */
        __REG(CCM_CGR2) = __REG(CCM_CGR2) | (3 << 4);
 
-       gd->bd->bi_arch_number = MACH_TYPE_MX31LITE; /* board id for linux */
+       return 0;
+}
+
+int board_init(void)
+{
        gd->bd->bi_boot_params = (0x80000100);  /* adress of boot parameters */
 
        return 0;
 }
 
-int checkboard (void)
+int checkboard(void)
 {
        printf("Board: i.MX31 Litekit\n");
        return 0;