public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Beomho Seo <beomho.seo@samsung.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 2/3] arm: exynos: pinmux: Add sdmmc4 gpio configuration
Date: Wed, 05 Mar 2014 10:57:23 +0900	[thread overview]
Message-ID: <53168483.2080109@samsung.com> (raw)

For use dwmmc controller, add SDMMC4 gpio configuration.

Signed-off-by: Beomho Seo <beomho.seo@samsung.com>
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
---
 arch/arm/cpu/armv7/exynos/pinmux.c |   20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/arch/arm/cpu/armv7/exynos/pinmux.c b/arch/arm/cpu/armv7/exynos/pinmux.c
index 645c497..a67664f 100644
--- a/arch/arm/cpu/armv7/exynos/pinmux.c
+++ b/arch/arm/cpu/armv7/exynos/pinmux.c
@@ -623,16 +623,25 @@ 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 = 0;
 	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;
+		func = GPIO_FUNC(0x2);
+		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;
@@ -640,13 +649,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);
 	}
-	if (flags & PINMUX_FLAG_8BIT_MODE) {
+	if ((flags & PINMUX_FLAG_8BIT_MODE) &&
+			~(peripheral & PERIPH_ID_SDMMC2)) {
 		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);
 		}
@@ -710,10 +720,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:
-- 
1.7.9.5

-- 
Best Regards,

             reply	other threads:[~2014-03-05  1:57 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-05  1:57 Beomho Seo [this message]
2014-03-06  6:58 ` [U-Boot] [PATCH 2/3] arm: exynos: pinmux: Add sdmmc4 gpio configuration Minkyu Kang
2014-03-06  7:07   ` Jaehoon Chung

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=53168483.2080109@samsung.com \
    --to=beomho.seo@samsung.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox