From patchwork Wed Mar 23 13:42:50 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
X-Patchwork-Id: 655821
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2NDgiCS007808
	for <patchwork-linux-mmc@patchwork.kernel.org>;
	Wed, 23 Mar 2011 13:43:02 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S932384Ab1CWNnA (ORCPT
	<rfc822;patchwork-linux-mmc@patchwork.kernel.org>);
	Wed, 23 Mar 2011 09:43:00 -0400
Received: from moutng.kundenserver.de ([212.227.126.186]:56014 "EHLO
	moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S932310Ab1CWNm7 (ORCPT
	<rfc822; linux-mmc@vger.kernel.org>); Wed, 23 Mar 2011 09:42:59 -0400
Received: from axis700.grange (pD9EB90DE.dip0.t-ipconnect.de
	[217.235.144.222])
	by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis)
	id 0MXCmv-1QXtp00Zj3-00WLta; Wed, 23 Mar 2011 14:42:51 +0100
Received: by axis700.grange (Postfix, from userid 1000)
	id CBEBB189B86; Wed, 23 Mar 2011 14:42:50 +0100 (CET)
Received: from localhost (localhost [127.0.0.1])
	by axis700.grange (Postfix) with ESMTP id C8EA5189B85;
	Wed, 23 Mar 2011 14:42:50 +0100 (CET)
Date: Wed, 23 Mar 2011 14:42:50 +0100 (CET)
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
X-X-Sender: lyakh@axis700.grange
To: linux-sh@vger.kernel.org
cc: linux-mmc@vger.kernel.org, Chris Ball <cjb@laptop.org>,
	Ian Molton <ian@mnementh.co.uk>, Magnus Damm <magnus.damm@gmail.com>,
	Samuel Ortiz <sameo@linux.intel.com>, Paul Mundt <lethal@linux-sh.org>
Subject: [PATCH 2/6] sh: ecovec: use the CONFIG_MMC_TMIO symbols instead of
	MFD
In-Reply-To: <Pine.LNX.4.64.1103231156220.6836@axis700.grange>
Message-ID: <Pine.LNX.4.64.1103231432200.6836@axis700.grange>
References: <Pine.LNX.4.64.1103231156220.6836@axis700.grange>
MIME-Version: 1.0
X-Provags-ID: V02:K0:RAVWNL7dCLqKUPoUdroqSevz6cxSwRYbbzmS+Yo1r60
	5LFLKwH753ZwMujF45bXiUR9+P16FF6GVHw81gXzLF45xf+OIY
	ZpQMiINB0fyWeqMG+3qG+WqnX8TO3ch/Q7Mve878m3La1/CZvl
	omM8EJ8qqVMdTBoinQirm6XUXVTTdoAPbiPECbUX8ABT8KbDbi
	29pbcMh7Q1PG51aL3IVsRA4otdNss6SyEnBrM/Fpc4=
Sender: linux-mmc-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-mmc.vger.kernel.org>
X-Mailing-List: linux-mmc@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]);
	Wed, 23 Mar 2011 13:43:03 +0000 (UTC)


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);