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

[u-boot] / board / samsung / goni / goni.c

diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c
index 060d5d17c90ded26581ec94bf19b28847fc89298..581935d0547689d623e0ec3ff5e78f4bc31e82c3 100644 (file)
--- a/board/samsung/goni/goni.c
+++ b/board/samsung/goni/goni.c
@@ -42,6 +42,14 @@ int board_init(void)
 }
 
 int dram_init(void)
+{
+       gd->ram_size = PHYS_SDRAM_1_SIZE + PHYS_SDRAM_2_SIZE +
+                       PHYS_SDRAM_3_SIZE;
+
+       return 0;
+}
+
+void dram_init_banksize(void)
 {
        gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
        gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
@@ -49,8 +57,6 @@ int dram_init(void)
        gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE;
        gd->bd->bi_dram[2].start = PHYS_SDRAM_3;
        gd->bd->bi_dram[2].size = PHYS_SDRAM_3_SIZE;
-
-       return 0;
 }
 
 #ifdef CONFIG_DISPLAY_BOARDINFO
@@ -67,7 +73,7 @@ int board_mmc_init(bd_t *bis)
        int i;
 
        /* MASSMEMORY_EN: XMSMDATA7: GPJ2[7] output high */
-       gpio_direction_output(&s5pc110_gpio->gpio_j2, 7, 1);
+       gpio_direction_output(&s5pc110_gpio->j2, 7, 1);
 
        /*
         * MMC0 GPIO
@@ -80,13 +86,13 @@ int board_mmc_init(bd_t *bis)
                if (i == 2)
                        continue;
                /* GPG0[0:6] special function 2 */
-               gpio_cfg_pin(&s5pc110_gpio->gpio_g0, i, 0x2);
+               gpio_cfg_pin(&s5pc110_gpio->g0, i, 0x2);
                /* GPG0[0:6] pull disable */
-               gpio_set_pull(&s5pc110_gpio->gpio_g0, i, GPIO_PULL_NONE);
+               gpio_set_pull(&s5pc110_gpio->g0, i, GPIO_PULL_NONE);
                /* GPG0[0:6] drv 4x */
-               gpio_set_drv(&s5pc110_gpio->gpio_g0, i, GPIO_DRV_4X);
+               gpio_set_drv(&s5pc110_gpio->g0, i, GPIO_DRV_4X);
        }
 
-       return s5p_mmc_init(0);
+       return s5p_mmc_init(0, 4);
 }
 #endif