Hi Piotr,
On 08/29/2012 04:56 PM, Piotr Wilczek wrote:
This patch add pinmux settings for Exynos4 for mmc0 and mmc2
Signed-off-by: Piotr Wilczek p.wilczek@samsung.com Signed-off-by: Kyungmin Park kyungmin.park@samsung.com CC: Minkyu Kang mk7.kang@samsung.com
Changes for v2:
- mmc initialisation code moved to pinmux instead of creating a new common code file
Changes for v3:
- no changes
arch/arm/cpu/armv7/exynos/pinmux.c | 56 +++++++++++++++++++++++++++++ arch/arm/include/asm/arch-exynos/periph.h | 1 + 2 files changed, 57 insertions(+), 0 deletions(-)
diff --git a/arch/arm/cpu/armv7/exynos/pinmux.c b/arch/arm/cpu/armv7/exynos/pinmux.c index d2b7d2c..84ee05c 100644 --- a/arch/arm/cpu/armv7/exynos/pinmux.c +++ b/arch/arm/cpu/armv7/exynos/pinmux.c @@ -209,10 +209,66 @@ static int exynos5_pinmux_config(int peripheral, int flags) return 0; }
+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;
bank, bank_ext is uninitialized.
- int i;
- switch (peripheral) {
- case PERIPH_ID_SDMMC0:
bank = &gpio2->k0;bank_ext = &gpio2->k1;break;- case PERIPH_ID_SDMMC2:
bank = &gpio2->k2;bank_ext = &gpio2->k3;break;- }
- for (i = 0; i < 7; i++) {
if (i == 2)continue;s5p_gpio_cfg_pin(bank, i, GPIO_FUNC(0x2));s5p_gpio_set_pull(bank, i, GPIO_PULL_NONE);s5p_gpio_set_drv(bank, i, GPIO_DRV_4X);- }
- if (flags & PINMUX_FLAG_8BIT_MODE) {
for (i = 3; i < 7; i++) {s5p_gpio_cfg_pin(bank_ext, i, GPIO_FUNC(0x3));s5p_gpio_set_pull(bank_ext, i, GPIO_PULL_NONE);s5p_gpio_set_drv(bank_ext, i, GPIO_DRV_4X);}- }
- return 0;
+}
+static int exynos4_pinmux_config(int peripheral, int flags) +{
- switch (peripheral) {
- case PERIPH_ID_SDMMC0:
- case PERIPH_ID_SDMMC2:
return exynos4_mmc_config(peripheral, flags);- case PERIPH_ID_SDMMC1:
- case PERIPH_ID_SDMMC3:
- case PERIPH_ID_SDMMC4:
printf("SDMMC device %d not implemented\n", peripheral);return -1;- default:
debug("%s: invalid peripheral %d", __func__, peripheral);return -1;- }
- return 0;
+}
int exynos_pinmux_config(int peripheral, int flags) { if (cpu_is_exynos5()) return exynos5_pinmux_config(peripheral, flags);
- else if (cpu_is_exynos4())
return exynos4_pinmux_config(peripheral, flags);diff --git a/arch/arm/include/asm/arch-exynos/periph.h b/arch/arm/include/asm/arch-exynos/periph.h index 5db25aa..4e1da82 100644 --- a/arch/arm/include/asm/arch-exynos/periph.h +++ b/arch/arm/include/asm/arch-exynos/periph.h @@ -34,6 +34,7 @@ enum periph_id { PERIPH_ID_SDMMC1, PERIPH_ID_SDMMC2, PERIPH_ID_SDMMC3,
- PERIPH_ID_SDMMC4, PERIPH_ID_SROMC, PERIPH_ID_UART0, PERIPH_ID_UART1,