arm:goni:mmc: Add sd card detection and initialization.
PATCH 1/1 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.
--- board/samsung/goni/goni.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-)
board/samsung/goni/goni.c +31 -2
@@ -72,7 +72,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 );
@@ -95,7 +95,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) +puts ("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) +puts ("MMC: Failed to init SD card (MMC:2).\n" ); + } + +return ret | ret_sd; }#endif
Signature · 1 line
1.7.9.5
PATCH 1/1 arm:goni:mmc: Add sd card detection and initialization.
Dear Przemyslaw,
Quoted 46 lines · Przemyslaw Marczak
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 <[email protected]>Signed-off-by Kyungmin Park <[email protected]>CC Minkyu Kang <[email protected]>--- board/samsung/goni/goni.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-)board/samsung/goni/goni.c +18
-2@@ -72,7 +72,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 );@@ -95,7 +95,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) +puts ("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 */
board/samsung/goni/goni.c int board_mmc_init(bd_t *bis) · line 124
Quoted 10 lines
board/samsung/goni/goni.c +10
-0+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) +puts ("MMC: Failed to init SD card (MMC:2).\n" );
I think you can refer to trats.c.
Best Regards,
Jaehoon Chung
Quoted 7 lines
board/samsung/goni/goni.c +3
-0+ } + +return ret | ret_sd; }#endif
PATCH v3 1/1 arm:goni:mmc: Add sd card detection and initialization.
In reply to Przemyslaw MarczakThis 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.
---
Changes for v2:
- add ret_sd for sd card initialization errors
- return bit OR of ret and ret_sd values
Changes for v3:
- change puts() to error() when prints error message
- chance BIT OR on ret and sd_ret to BIT AND
Now return value is 0 if any card will init succeed and -1 if both fails.
--- board/samsung/goni/goni.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-)
board/samsung/goni/goni.c +31 -2
@@ -72,7 +72,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 );
@@ -95,7 +95,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
Signature · 1 line
1.7.9.5
PATCH v3 1/1 arm:goni:mmc: Add sd card detection and initialization.
Looks good to me.
Quoted 74 lines · Przemyslaw Marczak
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 <[email protected]>Signed-off-by Kyungmin Park <[email protected]>CC Minkyu Kang <[email protected]>---
Changes for v2:
- addret_sdfor sd card initialization errors
- return bit OR of ret andret_sdvaluesChanges for v3:
- changeputs()toerror()when prints error message
- chance BIT OR on ret andsd_retto BIT ANDNow return value is 0 if any card will init succeed and -1 if both fails.
--- board/samsung/goni/goni.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-)board/samsung/goni/goni.c +31
-2@@ -72,7 +72,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 );@@ -95,7 +95,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
PATCH v3 1/1 arm:goni:mmc: Add sd card detection and initialization.
Quoted 27 lines · Jaehoon Chung
Looks good to me.
Acked-by Jaehoon Chung <[email protected]>Quoted 22 lines · Przemyslaw Marczak
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 <[email protected]>Signed-off-by Kyungmin Park <[email protected]>CC Minkyu Kang <[email protected]>---
Changes for v2:
- addret_sdfor sd card initialization errors
- return bit OR of ret andret_sdvaluesChanges for v3:
- changeputs()toerror()when prints error message
- chance BIT OR on ret andsd_retto BIT ANDNow return value is 0 if any card will init succeed and -1 if both fails.
--- board/samsung/goni/goni.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-)
applied to u-boot-samsung.
Thanks,
Minkyu Kang.