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 e512c59088746fd0056f32ff2f37aafadf9ca4da..581935d0547689d623e0ec3ff5e78f4bc31e82c3 100644 (file)
--- a/board/samsung/goni/goni.c
+++ b/board/samsung/goni/goni.c
@@ -23,11 +23,18 @@
  */
 
 #include <common.h>
+#include <asm/arch/gpio.h>
+#include <asm/arch/mmc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
+static struct s5pc110_gpio *s5pc110_gpio;
+
 int board_init(void)
 {
+       /* Set Initial global variables */
+       s5pc110_gpio = (struct s5pc110_gpio *)S5PC110_GPIO_BASE;
+
        gd->bd->bi_arch_number = MACH_TYPE_GONI;
        gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
 
@@ -35,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;
@@ -42,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
@@ -53,3 +66,33 @@ int checkboard(void)
        return 0;
 }
 #endif
+
+#ifdef CONFIG_GENERIC_MMC
+int board_mmc_init(bd_t *bis)
+{
+       int i;
+
+       /* MASSMEMORY_EN: XMSMDATA7: GPJ2[7] output high */
+       gpio_direction_output(&s5pc110_gpio->j2, 7, 1);
+
+       /*
+        * MMC0 GPIO
+        * GPG0[0]      SD_0_CLK
+        * GPG0[1]      SD_0_CMD
+        * GPG0[2]      SD_0_CDn        -> Not used
+        * GPG0[3:6]    SD_0_DATA[0:3]
+        */
+       for (i = 0; i < 7; i++) {
+               if (i == 2)
+                       continue;
+               /* GPG0[0:6] special function 2 */
+               gpio_cfg_pin(&s5pc110_gpio->g0, i, 0x2);
+               /* GPG0[0:6] pull disable */
+               gpio_set_pull(&s5pc110_gpio->g0, i, GPIO_PULL_NONE);
+               /* GPG0[0:6] drv 4x */
+               gpio_set_drv(&s5pc110_gpio->g0, i, GPIO_DRV_4X);
+       }
+
+       return s5p_mmc_init(0, 4);
+}
+#endif