From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
To: linux-sh@vger.kernel.org
Cc: linux-mmc@vger.kernel.org, Chris Ball <cjb@laptop.org>,
Ian Molton <ian@mnementh.co.uk>
Subject: [PATCH 2/6] sh: ecovec: use the CONFIG_MMC_TMIO symbols instead of
Date: Fri, 11 Mar 2011 07:52:02 +0000 [thread overview]
Message-ID: <Pine.LNX.4.64.1103110845220.23675@axis700.grange> (raw)
In-Reply-To: <Pine.LNX.4.64.1103110831510.23675@axis700.grange>
The CONFIG_MFD_SH_MOBILE_SDHI Kconfig symbol is going to disappear soon,
switch ecovec to using CONFIG_MMC_TMIO(_MODULE).
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
arch/sh/boards/mach-ecovec24/setup.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 52751f0..37ad5dc 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -462,7 +462,7 @@ static struct i2c_board_info ts_i2c_clients = {
.irq = IRQ0,
};
-#ifdef CONFIG_MFD_SH_MOBILE_SDHI
+#if defined(CONFIG_MMC_TMIO) || defined(CONFIG_MMC_TMIO_MODULE)
/* SDHI0 */
static void sdhi0_set_pwr(struct platform_device *pdev, int state)
{
@@ -887,7 +887,7 @@ static struct platform_device *ecovec_devices[] __initdata = {
&ceu0_device,
&ceu1_device,
&keysc_device,
-#ifdef CONFIG_MFD_SH_MOBILE_SDHI
+#if defined(CONFIG_MMC_TMIO) || defined(CONFIG_MMC_TMIO_MODULE)
&sdhi0_device,
#if !defined(CONFIG_MMC_SH_MMCIF)
&sdhi1_device,
@@ -1169,7 +1169,7 @@ static int __init arch_setup(void)
gpio_direction_input(GPIO_PTR5);
gpio_direction_input(GPIO_PTR6);
-#ifdef CONFIG_MFD_SH_MOBILE_SDHI
+#if defined(CONFIG_MMC_TMIO) || defined(CONFIG_MMC_TMIO_MODULE)
/* enable SDHI0 on CN11 (needs DS2.4 set to ON) */
gpio_request(GPIO_FN_SDHI0CD, NULL);
gpio_request(GPIO_FN_SDHI0WP, NULL);
--
1.7.2.3
next prev parent reply other threads:[~2011-03-11 7:52 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-11 7:51 [PATCH 0/6] mmc: split the tmio driver into several modules Guennadi Liakhovetski
2011-03-11 7:51 ` [PATCH 1/6] mmc: tmio: split core functionality, DMA and MFD glue Guennadi Liakhovetski
2011-03-12 16:05 ` Magnus Damm
2011-03-12 22:48 ` [PATCH 1/6] mmc: tmio: split core functionality, DMA and MFD Guennadi Liakhovetski
2011-03-13 3:57 ` [PATCH 1/6] mmc: tmio: split core functionality, DMA and MFD glue Magnus Damm
2011-03-13 22:51 ` [PATCH 1/6] mmc: tmio: split core functionality, DMA and MFD Guennadi Liakhovetski
2011-03-15 9:01 ` [PATCH 1/6] mmc: tmio: split core functionality, DMA and MFD glue Magnus Damm
2011-03-16 11:09 ` Ian Molton
2011-03-16 12:37 ` Magnus Damm
2011-03-21 11:19 ` [PATCH 1/6] mmc: tmio: split core functionality, DMA and MFD Guennadi Liakhovetski
2011-03-11 7:52 ` Guennadi Liakhovetski [this message]
2011-03-12 16:18 ` [PATCH 2/6] sh: ecovec: use the CONFIG_MMC_TMIO symbols instead Magnus Damm
2011-03-12 23:00 ` Guennadi Liakhovetski
2011-03-11 7:52 ` [PATCH 3/6] mmc: tmio: convert the SDHI MMC driver from MFD to a Guennadi Liakhovetski
2011-03-13 4:14 ` Magnus Damm
2011-03-14 8:01 ` [PATCH 3/6] mmc: tmio: convert the SDHI MMC driver from MFD to Guennadi Liakhovetski
2011-03-15 9:09 ` [PATCH 3/6] mmc: tmio: convert the SDHI MMC driver from MFD to a Magnus Damm
2011-03-11 7:52 ` [PATCH 4/6] ARM: mach-shmobile: convert boards to use Guennadi Liakhovetski
2011-03-11 7:52 ` [PATCH 5/6] sh: convert boards to use linux/mmc/sh_mobile_sdhi.h Guennadi Liakhovetski
2011-03-11 7:52 ` [PATCH 6/6] mfd: remove now redundant sh_mobile_sdhi.h header Guennadi Liakhovetski
2011-03-15 21:25 ` [PATCH 0/6] mmc: split the tmio driver into several modules Ian Molton
2011-03-21 11:38 ` Guennadi Liakhovetski
2011-03-22 5:31 ` Simon Horman
2011-03-22 12:28 ` Paul Mundt
2011-03-22 22:06 ` Simon Horman
2011-03-23 14:54 ` Paul Mundt
2011-03-23 22:42 ` Simon Horman
-- strict thread matches above, loose matches on Subject: below --
2011-03-23 13:42 [PATCH 0/6 v2] " Guennadi Liakhovetski
2011-03-23 13:42 ` [PATCH 2/6] sh: ecovec: use the CONFIG_MMC_TMIO symbols instead of Guennadi Liakhovetski
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=Pine.LNX.4.64.1103110845220.23675@axis700.grange \
--to=g.liakhovetski@gmx.de \
--cc=cjb@laptop.org \
--cc=ian@mnementh.co.uk \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-sh@vger.kernel.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