Patchwork [U-Boot,2/3] arm:goni:mmc: Add sd card detection and initialization.

login
register
mail settings
Submitter Przemyslaw Marczak
Date Aug. 20, 2013, 10:53 a.m.
Message ID <1376995992-20870-2-git-send-email-p.marczak@samsung.com>
Download mbox | patch
Permalink /patch/268490/
State Changes Requested
Delegated to: Minkyu Kang
Headers show

Comments

Przemyslaw Marczak - Aug. 20, 2013, 10:53 a.m.
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".

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>
---
 board/samsung/goni/goni.c |   32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)
Przemyslaw Marczak - Aug. 28, 2013, 7:39 a.m.
Hello Minkyu,

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

Could you review this patch, please?

>
> 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>
> ---
>   board/samsung/goni/goni.c |   32 +++++++++++++++++++++++++++++++-
>   1 file changed, 31 insertions(+), 1 deletion(-)
>
> diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c
> index c05801d..3b236b4 100644
> --- a/board/samsung/goni/goni.c
> +++ b/board/samsung/goni/goni.c
> @@ -69,6 +69,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);
> @@ -91,7 +92,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");
> +		return ret;
> +	}
> +
> +	/*
> +	 * 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
>
>
Jaehoon Chung - Aug. 28, 2013, 8:41 a.m.
On 08/28/2013 04:39 PM, Przemyslaw Marczak wrote:
> Hello Minkyu,
> 
>> 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".
> 
> Could you review this patch, please?
> 
>>
>> 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>
>> ---
>>   board/samsung/goni/goni.c |   32 +++++++++++++++++++++++++++++++-
>>   1 file changed, 31 insertions(+), 1 deletion(-)
>>
>> diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c
>> index c05801d..3b236b4 100644
>> --- a/board/samsung/goni/goni.c
>> +++ b/board/samsung/goni/goni.c
>> @@ -69,6 +69,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);
>> @@ -91,7 +92,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");
>> +        return ret;
>> +    }
When eMMC init is failed, immediately return?
I think that even if eMMC init is failed, there is worth that try to init SD-card.

Best Regards,
Jaehoon Chung
>> +
>> +    /*
>> +     * 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
>>
>>
> 
>
Przemyslaw Marczak - Aug. 28, 2013, 10:11 a.m.
On 08/28/2013 10:41 AM, Jaehoon Chung wrote:

> When eMMC init is failed, immediately return?
> I think that even if eMMC init is failed, there is worth that try to init SD-card.
>
> Best Regards,
> Jaehoon Chung

Hi Jaehoon,
You're right, I will change this.
Regards

Patch

diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c
index c05801d..3b236b4 100644
--- a/board/samsung/goni/goni.c
+++ b/board/samsung/goni/goni.c
@@ -69,6 +69,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);
@@ -91,7 +92,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");
+		return ret;
+	}
+
+	/*
+	 * 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