Dear Beomho Seo,

On 03/14/2014 09:33 AM, Beomho Seo wrote:
For use dwmmc controller at exynos4, add SDMMC gpio configuration.
In case SDMMC2, do not use 8bit mode at exynos4.

Signed-off-by: Beomho Seo <beomho....@samsung.com>
Signed-off-by: Jaehoon Chung <jh80.ch...@samsung.com>
Cc: Lukasz Majewski <l.majew...@samsung.com>
Cc: Piotr Wilczek <p.wilc...@samsung.com>
Cc: Minkyu Kang <mk7.k...@samsung.com>
---
Changes for v2:
- Fixed value initialise.
- Comment add in function.

  arch/arm/cpu/armv7/exynos/pinmux.c |   19 +++++++++++++++----
  1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/arch/arm/cpu/armv7/exynos/pinmux.c 
b/arch/arm/cpu/armv7/exynos/pinmux.c
index 9edb475..3dce5d2 100644
--- a/arch/arm/cpu/armv7/exynos/pinmux.c
+++ b/arch/arm/cpu/armv7/exynos/pinmux.c
@@ -632,16 +632,26 @@ static int exynos4_mmc_config(int peripheral, int flags)
        struct exynos4_gpio_part2 *gpio2 =
                (struct exynos4_gpio_part2 *)samsung_get_base_gpio_part2();
        struct s5p_gpio_bank *bank, *bank_ext;
+       unsigned int  func, func_ext;
        int i;

        switch (peripheral) {
        case PERIPH_ID_SDMMC0:
                bank = &gpio2->k0;
                bank_ext = &gpio2->k1;
+               func = GPIO_FUNC(0x2);
+               func_ext = GPIO_FUNC(0x3);
                break;
        case PERIPH_ID_SDMMC2:
                bank = &gpio2->k2;
-               bank_ext = &gpio2->k3;
that causes warning 'bank_ext' may be used uninitialized in this function

+               func = GPIO_FUNC(0x2);
+               func_ext = 0;
+               break;
+       case PERIPH_ID_SDMMC4:
+               bank = &gpio2->k0;
+               bank_ext = &gpio2->k1;
+               func = GPIO_FUNC(0x3);
+               func_ext = GPIO_FUNC(0x4);
                break;
        default:
                return -1;
@@ -649,13 +659,14 @@ static int exynos4_mmc_config(int peripheral, int flags)
        for (i = 0; i < 7; i++) {
                if (i == 2)
                        continue;
-               s5p_gpio_cfg_pin(bank, i,  GPIO_FUNC(0x2));
+               s5p_gpio_cfg_pin(bank, i,  func);
                s5p_gpio_set_pull(bank, i, GPIO_PULL_NONE);
                s5p_gpio_set_drv(bank, i, GPIO_DRV_4X);
        }
+       /* SDMMC do not use 8bit mode at exynos4 */
        if (flags & PINMUX_FLAG_8BIT_MODE) {
                for (i = 3; i < 7; i++) {
-                       s5p_gpio_cfg_pin(bank_ext, i,  GPIO_FUNC(0x3));
+                       s5p_gpio_cfg_pin(bank_ext, i,  func_ext);
                        s5p_gpio_set_pull(bank_ext, i, GPIO_PULL_NONE);
                        s5p_gpio_set_drv(bank_ext, i, GPIO_DRV_4X);
                }
@@ -722,10 +733,10 @@ static int exynos4_pinmux_config(int peripheral, int 
flags)
                break;
        case PERIPH_ID_SDMMC0:
        case PERIPH_ID_SDMMC2:
+       case PERIPH_ID_SDMMC4:
                return exynos4_mmc_config(peripheral, flags);
        case PERIPH_ID_SDMMC1:
        case PERIPH_ID_SDMMC3:
-       case PERIPH_ID_SDMMC4:
                debug("SDMMC device %d not implemented\n", peripheral);
                return -1;
        default:


Best regards,
Piotr Wilczek

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to