diff options
author | Tom Rini <trini@ti.com> | 2014-09-12 11:27:46 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-09-12 11:27:46 -0400 |
commit | 114cc4290b2f24bb314edf2edd5d8738a0778c4b (patch) | |
tree | e3ca947656fea69adb810bab0ee5a32c0d413919 /arch/arm/cpu/armv7/exynos/pinmux.c | |
parent | b7a809957bcd72c2efa49ce733774b1e28878585 (diff) | |
parent | a7f99bf139b3aaa0d5494693fd0395084355e41a (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/cpu/armv7/exynos/pinmux.c')
-rw-r--r-- | arch/arm/cpu/armv7/exynos/pinmux.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/exynos/pinmux.c b/arch/arm/cpu/armv7/exynos/pinmux.c index 86a0c75326..b929486da9 100644 --- a/arch/arm/cpu/armv7/exynos/pinmux.c +++ b/arch/arm/cpu/armv7/exynos/pinmux.c @@ -704,8 +704,8 @@ static int exynos4x12_mmc_config(int peripheral, int flags) ext_func = S5P_GPIO_FUNC(0x3); break; case PERIPH_ID_SDMMC4: - start = EXYNOS4_GPIO_K00; - start_ext = EXYNOS4_GPIO_K13; + start = EXYNOS4X12_GPIO_K00; + start_ext = EXYNOS4X12_GPIO_K13; func = S5P_GPIO_FUNC(0x3); ext_func = S5P_GPIO_FUNC(0x4); break; |