Skip to contentSkip to conversation

arm:goni:mmc: Add sd card detection and initialization.

PATCH New Przemyslaw Marczak 3 participants 4 messages Sep 3, 2013 – Sep 9, 2013

lore
Share & tools
lore
#0 lore raw

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 |   31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)
board/samsung/goni/goni.c +30 -1
index 5b3d6ef..7098fe7 100644
@@ -73,6 +73,7 @@ int checkboard(void)
 int board_mmc_init(bd_t *bis)
 {
 	int i;
+	int ret;
 
 	/* MASSMEMORY_EN: XMSMDATA7: GPJ2[7] output high */
 	s5p_gpio_direction_output(&s5pc110_gpio->j2, 7, 1);
@@ -95,7 +96,35 @@ 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);
+		}
+		if (s5p_mmc_init(2, 4))
+			puts("MMC: Failed to init SD card (MMC:2).\n");
+	}
+
+	/* SD card init is optional so print information when it fails only */
+	return ret;
 }
 #endif
 
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 arm:goni:mmc: Add sd card detection and initialization.

Hello Minkyu,

Quoted 7 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.

Could you review this patch, please?
Thank you.

Signature · 4 lines
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com
#2 lore raw

PATCH 1/1 arm:goni:mmc: Add sd card detection and initialization.

In reply to Przemyslaw Marczak

Hi,

Quoted 43 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.

---
 board/samsung/goni/goni.c |   31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)
board/samsung/goni/goni.c +16 -1
index 5b3d6ef..7098fe7 100644
@@ -73,6 +73,7 @@ int checkboard(void)
 int board_mmc_init(bd_t *bis)
 {
 	int i;
+	int ret;
 
 	/* MASSMEMORY_EN: XMSMDATA7: GPJ2[7] output high */
 	s5p_gpio_direction_output(&s5pc110_gpio->j2, 7, 1);
@@ -95,7 +96,35 @@ 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)

board/samsung/goni/goni.c int board_mmc_init(bd_t *bis) · line 123

Quoted 10 lines
board/samsung/goni/goni.c +10 -0
+				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);
+		}
+		if (s5p_mmc_init(2, 4))
+			puts("MMC: Failed to init SD card (MMC:2).\n");

Well, i think this is not good.

ret = s5p_mmc_init(2, 5)

if (ret) {
	....
}

return ret;

Your checking is always returned "fail",if emmc is failed.

Best Regards,
Jaehoon Chung

Quoted 8 lines
board/samsung/goni/goni.c +4 -0
+	}
+
+	/* SD card init is optional so print information when it fails only */
+	return ret;
 }
 #endif
 
#3 lore raw

PATCH 1/1 arm:goni:mmc: Add sd card detection and initialization.

In reply to Przemyslaw Marczak

Dear Przemyslaw Marczak,

Quoted 24 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.

---
 board/samsung/goni/goni.c |   31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)
board/samsung/goni/goni.c +1 -0
index 5b3d6ef..7098fe7 100644
@@ -73,6 +73,7 @@ int checkboard(void)
 int board_mmc_init(bd_t *bis)
 {
 	int i;
+	int ret;
 
 	/* MASSMEMORY_EN: XMSMDATA7: GPJ2[7] output high */
 	s5p_gpio_direction_output(&s5pc110_gpio->j2, 7, 1);

board/samsung/goni/goni.c int board_mmc_init(bd_t *bis) · line 102

Quoted 8 lines
board/samsung/goni/goni.c +4 -1
@@ -95,7 +96,35 @@ 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");
+	}

please remove brace.

board/samsung/goni/goni.c int board_mmc_init(bd_t *bis) · line 114

Quoted 12 lines
board/samsung/goni/goni.c +12 -0
+
+	/*
+	 * 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;

please add blank line.

board/samsung/goni/goni.c int board_mmc_init(bd_t *bis) · line 121

Quoted 7 lines
board/samsung/goni/goni.c +7 -0
+			/* 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);
+		}

please add blank line.

board/samsung/goni/goni.c int board_mmc_init(bd_t *bis) · line 126

Quoted 5 lines
board/samsung/goni/goni.c +5 -0
+		if (s5p_mmc_init(2, 4))
+			puts("MMC: Failed to init SD card (MMC:2).\n");
+	}
+
+	/* SD card init is optional so print information when it fails only */

maybe this comment should be located near s5p_mmc_init(2, 4).

board/samsung/goni/goni.c int board_mmc_init(bd_t *bis) · line 130

Quoted 5 lines
board/samsung/goni/goni.c +1 -0
+	return ret;
 }
 #endif
 

Thanks,
Minkyu Kang.