From patchwork Fri Jul 10 12:43:16 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Hunter X-Patchwork-Id: 35008 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n6ACgeD6014201 for ; Fri, 10 Jul 2009 12:42:43 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755542AbZGJMjq (ORCPT ); Fri, 10 Jul 2009 08:39:46 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755539AbZGJMjq (ORCPT ); Fri, 10 Jul 2009 08:39:46 -0400 Received: from smtp.nokia.com ([192.100.122.230]:37229 "EHLO mgw-mx03.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754777AbZGJMjo (ORCPT ); Fri, 10 Jul 2009 08:39:44 -0400 Received: from vaebh105.NOE.Nokia.com (vaebh105.europe.nokia.com [10.160.244.31]) by mgw-mx03.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id n6ACdBFs001692; Fri, 10 Jul 2009 15:39:35 +0300 Received: from vaebh104.NOE.Nokia.com ([10.160.244.30]) by vaebh105.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 10 Jul 2009 15:39:40 +0300 Received: from mgw-sa01.ext.nokia.com ([147.243.1.47]) by vaebh104.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Fri, 10 Jul 2009 15:39:39 +0300 Received: from [127.0.1.1] (esdhcp042131.research.nokia.com [172.21.42.131]) by mgw-sa01.ext.nokia.com (Switch-3.2.6/Switch-3.2.6) with ESMTP id n6ACdbET028314; Fri, 10 Jul 2009 15:39:37 +0300 From: Adrian Hunter To: Pierre Ossman Cc: Jarkko Lavinen , Denis Karpov , Adrian Hunter , linux-omap Mailing List , lkml Date: Fri, 10 Jul 2009 15:43:16 +0300 Message-Id: <20090710124316.1262.42455.sendpatchset@ahunter-tower> In-Reply-To: <20090710124004.1262.10422.sendpatchset@ahunter-tower> References: <20090710124004.1262.10422.sendpatchset@ahunter-tower> Subject: [PATCH 27/32] omap_hsmmc: pass host capabilities for SD only and MMC only X-OriginalArrivalTime: 10 Jul 2009 12:39:39.0690 (UTC) FILETIME=[7DC080A0:01CA015B] X-Nokia-AV: Clean Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org From 2c975c1612a3ef5f641881b69491265038f0c0b2 Mon Sep 17 00:00:00 2001 From: Adrian Hunter Date: Mon, 18 May 2009 11:33:26 +0300 Subject: [PATCH] omap_hsmmc: pass host capabilities for SD only and MMC only Some hosts can accept only certain types of cards. For example, an eMMC is MMC only and a uSD slot may be SD only. Pass host capabilities from the board through to the driver. Signed-off-by: Adrian Hunter --- arch/arm/mach-omap2/mmc-twl4030.c | 5 ++--- arch/arm/mach-omap2/mmc-twl4030.h | 2 +- arch/arm/plat-omap/include/mach/mmc.h | 6 +++--- drivers/mmc/host/omap_hsmmc.c | 3 +-- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/mmc-twl4030.c index f95c702..48765bf 100644 --- a/arch/arm/mach-omap2/mmc-twl4030.c +++ b/arch/arm/mach-omap2/mmc-twl4030.c @@ -464,12 +464,11 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers) } else mmc->slots[0].gpio_wp = -EINVAL; - if (c->nonremovable) - mmc->slots[0].nonremovable = 1; - if (c->power_saving) mmc->slots[0].power_saving = 1; + mmc->slots[0].caps = c->caps; + /* NOTE: MMC slots should have a Vcc regulator set up. * This may be from a TWL4030-family chip, another * controllable regulator, or a fixed supply. diff --git a/arch/arm/mach-omap2/mmc-twl4030.h b/arch/arm/mach-omap2/mmc-twl4030.h index a47e685..cb43f52 100644 --- a/arch/arm/mach-omap2/mmc-twl4030.h +++ b/arch/arm/mach-omap2/mmc-twl4030.h @@ -12,8 +12,8 @@ struct twl4030_hsmmc_info { bool transceiver; /* MMC-2 option */ bool ext_clock; /* use external pin for input clock */ bool cover_only; /* No card detect - just cover switch */ - bool nonremovable; /* Nonremovable e.g. eMMC */ bool power_saving; /* Try to sleep or power off when possible */ + unsigned long caps; /* MMC host capabilities */ int gpio_cd; /* or -EINVAL */ int gpio_wp; /* or -EINVAL */ char *name; /* or NULL for default */ diff --git a/arch/arm/plat-omap/include/mach/mmc.h b/arch/arm/plat-omap/include/mach/mmc.h index 9390297..48cf2de 100644 --- a/arch/arm/plat-omap/include/mach/mmc.h +++ b/arch/arm/plat-omap/include/mach/mmc.h @@ -83,12 +83,12 @@ struct omap_mmc_platform_data { /* use the internal clock */ unsigned internal_clock:1; - /* nonremovable e.g. eMMC */ - unsigned nonremovable:1; - /* Try to sleep or power off when possible */ unsigned power_saving:1; + /* MMC host capabilities */ + unsigned long caps; + int switch_pin; /* gpio (card detect) */ int gpio_wp; /* gpio (write protect) */ diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 38e1410..fa5f401 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -1655,8 +1655,7 @@ static int __init omap_mmc_probe(struct platform_device *pdev) else if (mmc_slot(host).wires >= 4) mmc->caps |= MMC_CAP_4_BIT_DATA; - if (mmc_slot(host).nonremovable) - mmc->caps |= MMC_CAP_NONREMOVABLE; + mmc->caps |= mmc_slot(host).caps; omap_hsmmc_init(host);