From: ido@wizery.com (Ido Yariv)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 4/6] arm: davinci: DA850: Add MMC/SD1 pinmux configuration
Date: Sun, 10 Jul 2011 16:14:37 +0300 [thread overview]
Message-ID: <1310303679-17936-5-git-send-email-ido@wizery.com> (raw)
In-Reply-To: <1310303679-17936-1-git-send-email-ido@wizery.com>
AM18x has two MMC slots. Add the required pinmux configuration for the
second slot.
Signed-off-by: Ido Yariv <ido@wizery.com>
---
arch/arm/mach-davinci/da850.c | 7 +++++++
arch/arm/mach-davinci/include/mach/mux.h | 8 ++++++++
2 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index 133aac4..f6eafb4 100644
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -525,6 +525,13 @@ static const struct mux_config da850_pins[] = {
MUX_CFG(DA850, MMCSD0_DAT_3, 10, 20, 15, 2, false)
MUX_CFG(DA850, MMCSD0_CLK, 10, 0, 15, 2, false)
MUX_CFG(DA850, MMCSD0_CMD, 10, 4, 15, 2, false)
+ /* MMC/SD1 function */
+ MUX_CFG(DA850, MMCSD1_DAT_0, 18, 8, 15, 2, false)
+ MUX_CFG(DA850, MMCSD1_DAT_1, 19, 16, 15, 2, false)
+ MUX_CFG(DA850, MMCSD1_DAT_2, 19, 12, 15, 2, false)
+ MUX_CFG(DA850, MMCSD1_DAT_3, 19, 8, 15, 2, false)
+ MUX_CFG(DA850, MMCSD1_CLK, 18, 12, 15, 2, false)
+ MUX_CFG(DA850, MMCSD1_CMD, 18, 16, 15, 2, false)
/* EMIF2.5/EMIFA function */
MUX_CFG(DA850, EMA_D_7, 9, 0, 15, 1, false)
MUX_CFG(DA850, EMA_D_6, 9, 4, 15, 1, false)
diff --git a/arch/arm/mach-davinci/include/mach/mux.h b/arch/arm/mach-davinci/include/mach/mux.h
index 5d4e0fe..7fb7f1e 100644
--- a/arch/arm/mach-davinci/include/mach/mux.h
+++ b/arch/arm/mach-davinci/include/mach/mux.h
@@ -857,6 +857,14 @@ enum davinci_da850_index {
DA850_MMCSD0_CLK,
DA850_MMCSD0_CMD,
+ /* MMC/SD1 function */
+ DA850_MMCSD1_DAT_0,
+ DA850_MMCSD1_DAT_1,
+ DA850_MMCSD1_DAT_2,
+ DA850_MMCSD1_DAT_3,
+ DA850_MMCSD1_CLK,
+ DA850_MMCSD1_CMD,
+
/* EMIF2.5/EMIFA function */
DA850_EMA_D_7,
DA850_EMA_D_6,
--
1.7.4.1
next prev parent reply other threads:[~2011-07-10 13:14 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-10 13:14 [PATCH v2 0/6] arm: davinci: DA850: wl12xx expansion card Ido Yariv
2011-07-10 13:14 ` [PATCH v2 1/6] arm: davinci: Fix low level gpio irq handlers' argument Ido Yariv
2011-07-11 11:58 ` Nori, Sekhar
2011-07-11 20:33 ` Ido Yariv
2011-07-11 21:03 ` [PATCH v3 " Ido Yariv
2011-07-12 9:22 ` Nori, Sekhar
2011-07-12 22:19 ` Ido Yariv
2011-07-10 13:14 ` [PATCH v2 2/6] arm: davinci: Explicitly set channel controllers' default queues Ido Yariv
2011-07-25 13:15 ` Nori, Sekhar
2011-07-25 13:33 ` Sergei Shtylyov
2011-07-25 16:31 ` Nori, Sekhar
2011-07-29 14:42 ` Ben Gardiner
2011-07-10 13:14 ` [PATCH v2 3/6] arm: davinci: mmc: Add support for set_power callback Ido Yariv
2011-07-25 13:19 ` Nori, Sekhar
2011-07-28 20:49 ` [PATCH REPOST v2] mmc: davinci: " Ido Yariv
2011-07-28 22:02 ` Chris Ball
2011-07-10 13:14 ` Ido Yariv [this message]
2011-07-10 13:14 ` [PATCH v2 5/6] arm: davinci: DA850: Add GPIO pinmux configuration for wl1271 Ido Yariv
2011-07-25 13:23 ` Nori, Sekhar
2011-07-10 13:14 ` [PATCH v2 6/6] arm: davinci: DA850: Add wl1271/wlan support Ido Yariv
2011-07-25 17:40 ` Nori, Sekhar
2011-07-28 18:34 ` Ido Yariv
2011-07-28 20:52 ` [PATCH v3] davinci: Add wl1271/wlan support for AM18x Ido Yariv
2011-07-28 21:15 ` Troy Kisky
2011-07-28 22:06 ` Ido Yariv
2011-07-29 18:51 ` Troy Kisky
2011-08-03 13:27 ` Nori, Sekhar
2011-08-04 7:51 ` [PATCH v4] ARM: davinci: AM18x: Add wl1271/wlan support Ido Yariv
2011-08-04 8:40 ` Jaya Kumar
2011-08-04 9:22 ` Ido Yariv
2011-09-01 11:59 ` Nori, Sekhar
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=1310303679-17936-5-git-send-email-ido@wizery.com \
--to=ido@wizery.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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;
as well as URLs for NNTP newsgroup(s).