diff options
| author | Przemyslaw Marczak <p.marczak@samsung.com> | 2013-09-10 11:34:49 +0200 |
|---|---|---|
| committer | Minkyu Kang <mk7.kang@samsung.com> | 2013-09-11 11:09:27 +0900 |
| commit | 5c18a1cf3e56e0177388258696be4a17a672e9d0 (patch) | |
| tree | 092a31f811cd535a53e126ace6647869a168e65b /board/samsung | |
| parent | 7324907082b94679fe57ba0067c1079a03cbfd89 (diff) | |
| download | blackbird-obmc-uboot-5c18a1cf3e56e0177388258696be4a17a672e9d0.tar.gz blackbird-obmc-uboot-5c18a1cf3e56e0177388258696be4a17a672e9d0.zip | |
arm:goni:mmc: Add sd card detection and initialization.
This change allow to use sd card on Goni the same like mmc 0.
SD card is mmc dev 1, so it can be used like this: "fatls mmc 1:2".
SD card is inited even if eMMC initialization fails.
Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
CC: Minkyu Kang <mk7.kang@samsung.com>
Acked-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Diffstat (limited to 'board/samsung')
| -rw-r--r-- | board/samsung/goni/goni.c | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c index c05801d3fe..4ddff04f41 100644 --- a/board/samsung/goni/goni.c +++ b/board/samsung/goni/goni.c @@ -68,7 +68,7 @@ int checkboard(void) #ifdef CONFIG_GENERIC_MMC int board_mmc_init(bd_t *bis) { - int i; + int i, ret, ret_sd = 0; /* MASSMEMORY_EN: XMSMDATA7: GPJ2[7] output high */ s5p_gpio_direction_output(&s5pc110_gpio->j2, 7, 1); @@ -91,7 +91,36 @@ int board_mmc_init(bd_t *bis) s5p_gpio_set_drv(&s5pc110_gpio->g0, i, GPIO_DRV_4X); } - return s5p_mmc_init(0, 4); + ret = s5p_mmc_init(0, 4); + if (ret) + error("MMC: Failed to init MMC:0.\n"); + + /* + * SD card (T_FLASH) detect and init + * T_FLASH_DETECT: EINT28: GPH3[4] input mode + */ + s5p_gpio_cfg_pin(&s5pc110_gpio->h3, 4, GPIO_INPUT); + s5p_gpio_set_pull(&s5pc110_gpio->h3, 4, GPIO_PULL_UP); + + if (!s5p_gpio_get_value(&s5pc110_gpio->h3, 4)) { + for (i = 0; i < 7; i++) { + if (i == 2) + continue; + + /* GPG2[0:6] special function 2 */ + s5p_gpio_cfg_pin(&s5pc110_gpio->g2, i, 0x2); + /* GPG2[0:6] pull disable */ + s5p_gpio_set_pull(&s5pc110_gpio->g2, i, GPIO_PULL_NONE); + /* GPG2[0:6] drv 4x */ + s5p_gpio_set_drv(&s5pc110_gpio->g2, i, GPIO_DRV_4X); + } + + ret_sd = s5p_mmc_init(2, 4); + if (ret_sd) + error("MMC: Failed to init SD card (MMC:2).\n"); + } + + return ret & ret_sd; } #endif |
