From patchwork Fri Mar 11 07:52:02 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 627531 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 p2B7pulR018780 for ; Fri, 11 Mar 2011 07:52:06 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752903Ab1CKHwG (ORCPT ); Fri, 11 Mar 2011 02:52:06 -0500 Received: from moutng.kundenserver.de ([212.227.17.8]:56955 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753090Ab1CKHwF (ORCPT ); Fri, 11 Mar 2011 02:52:05 -0500 Received: from axis700.grange (pD9EB8C3C.dip0.t-ipconnect.de [217.235.140.60]) by mrelayeu.kundenserver.de (node=mrbap1) with ESMTP (Nemesis) id 0MYcHS-1PTei10Nnu-00VhMl; Fri, 11 Mar 2011 08:52:04 +0100 Received: by axis700.grange (Postfix, from userid 1000) id B912B189B86; Fri, 11 Mar 2011 08:52:02 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id B6B0E189B85; Fri, 11 Mar 2011 08:52:02 +0100 (CET) Date: Fri, 11 Mar 2011 08:52:02 +0100 (CET) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: linux-sh@vger.kernel.org cc: linux-mmc@vger.kernel.org, Chris Ball , Ian Molton Subject: [PATCH 2/6] sh: ecovec: use the CONFIG_MMC_TMIO symbols instead of MFD In-Reply-To: Message-ID: References: MIME-Version: 1.0 X-Provags-ID: V02:K0:zN1HKFgSjhzprli1lhvjLJNQb9WBDfzixNDCcRhonid Prj5k66jEnBe2U27SR19HIrlVyMpotJs765ZtfiIj+oH7f79LK FUUPzDVYljInQmvxTkAn0SQlaF2LljxVovI5N1weYM5+dPEyhp L3wPNpEBOiqG0BLjmfdbFgEX20m+UvkHc34dSrHUo4JGD7SY4S JC3G8fTb+M3ubA9zqTlytgeK1lhyeYJ/mDFojb0Cfc= Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: 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]); Fri, 11 Mar 2011 07:52:06 +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);