Merge branch 'master' of http://git.denx.de/u-boot-sunxi

[u-boot] / arch / arm / mach-exynos / pinmux.c

diff --git a/arch/arm/mach-exynos/pinmux.c b/arch/arm/mach-exynos/pinmux.c
index a556e4afc7add8e9203b649a56e25bb6221cb425..fec2df9bd95013826d4e75e346835e3c97f6ce89 100644 (file)
--- a/arch/arm/mach-exynos/pinmux.c
+++ b/arch/arm/mach-exynos/pinmux.c
@@ -506,6 +506,9 @@ static int exynos5_pinmux_config(int peripheral, int flags)
                 */
                gpio_set_pull(EXYNOS5_GPIO_X07, S5P_GPIO_PULL_NONE);
                break;
+       case PERIPH_ID_PWM0:
+               gpio_cfg_pin(EXYNOS5_GPIO_B20, S5P_GPIO_FUNC(2));
+               break;
        default:
                debug("%s: invalid peripheral %d", __func__, peripheral);
                return -1;
@@ -548,6 +551,9 @@ static int exynos5420_pinmux_config(int peripheral, int flags)
        case PERIPH_ID_I2C10:
                exynos5420_i2c_config(peripheral);
                break;
+       case PERIPH_ID_PWM0:
+               gpio_cfg_pin(EXYNOS5420_GPIO_B20, S5P_GPIO_FUNC(2));
+               break;
        default:
                debug("%s: invalid peripheral %d", __func__, peripheral);
                return -1;
@@ -737,10 +743,10 @@ static int exynos4x12_mmc_config(int peripheral, int flags)
                return -1;
        }
        for (i = start; i < (start + 7); i++) {
+               gpio_set_pull(i, S5P_GPIO_PULL_NONE);
                if (i == (start + 2))
                        continue;
                gpio_cfg_pin(i,  func);
-               gpio_set_pull(i, S5P_GPIO_PULL_NONE);
                gpio_set_drv(i, S5P_GPIO_DRV_4X);
        }
        if (flags & PINMUX_FLAG_8BIT_MODE) {