Return-Path: <adrian.hunter@nokia.com>

X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on y.localdomain
X-Spam-Level: 
X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham
	version=3.2.4
Received: from y.localdomain (y.localdomain [127.0.0.1])
	by y.localdomain (8.14.2/8.14.2) with ESMTP id n89BxWQE016148
	for <akpm@localhost>; Wed, 9 Sep 2009 05:00:02 -0700
Received: from imap1.linux-foundation.org [140.211.169.55]
	by y.localdomain with POP3 (fetchmail-6.3.8)
	for <akpm@localhost> (single-drop); Wed, 09 Sep 2009 05:00:02 -0700 (PDT)
Received: from smtp1.linux-foundation.org (smtp1.linux-foundation.org [140.211.169.13])
	by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id n89BwdoO008252
	for <akpm@imap1.linux-foundation.org>; Wed, 9 Sep 2009 04:58:39 -0700
Received: from mgw-mx06.nokia.com (smtp.nokia.com [192.100.122.233])
	by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id n89BwUe3024088
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL)
	for <akpm@linux-foundation.org>; Wed, 9 Sep 2009 04:58:33 -0700
Received: from vaebh106.NOE.Nokia.com (vaebh106.europe.nokia.com [10.160.244.32])
	by mgw-mx06.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id n89Bw4Ro006796;
	Wed, 9 Sep 2009 14:58:13 +0300
Received: from esebh102.NOE.Nokia.com ([172.21.138.183]) by vaebh106.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959);
	 Wed, 9 Sep 2009 14:58:12 +0300
Received: from mgw-da01.ext.nokia.com ([147.243.128.24]) by esebh102.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959);
	 Wed, 9 Sep 2009 14:58:11 +0300
Received: from [127.0.1.1] (esdhcp041173.research.nokia.com [172.21.41.173])
	by mgw-da01.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id n89Bw3gl008159;
	Wed, 9 Sep 2009 14:58:04 +0300
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Jarkko Lavinen <jarkko.lavinen@nokia.com>,
        Adrian Hunter <adrian.hunter@nokia.com>,
        Madhusudhan Chikkature <madhu.cr@ti.com>,
        linux-mmc Mailing List <linux-mmc@vger.kernel.org>,
        linux-omap Mailing List <linux-omap@vger.kernel.org>,
        Pierre Ossman <pierre@ossman.eu>,
        Matt Fleming <matt@console-pimps.org>
Date: Wed, 09 Sep 2009 14:58:33 +0300
Message-Id: <20090909115833.12833.93842.sendpatchset@ahunter-laptop>
In-Reply-To: <20090909115633.12833.39619.sendpatchset@ahunter-laptop>
References: <20090909115633.12833.39619.sendpatchset@ahunter-laptop>
Subject: [PATCH V3 16/30] omap_hsmmc: make use of new MMC_CAP_NONREMOVABLE host capability
X-OriginalArrivalTime: 09 Sep 2009 11:58:12.0175 (UTC) FILETIME=[CE4695F0:01CA3144]
Received-SPF: none (domain of adrian.hunter@nokia.com does not designate permitted sender hosts)
X-MIMEDefang-Filter: lf$Revision: 1.188 $
X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13
>From 4344e2509599b187ff98b5ad8ea0f8dede2d9374 Mon Sep 17 00:00:00 2001
Date: Mon, 11 May 2009 10:06:38 +0300
Subject: [PATCH] omap_hsmmc: make use of new MMC_CAP_NONREMOVABLE host capability
Let the board specify that a card is nonremovable e.g. eMMC
Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>

arch/arm/mach-omap2/mmc-twl4030.c

@@ -415,6 +415,9 @@ 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;
+
 		/* 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.

arch/arm/mach-omap2/mmc-twl4030.h

@@ -12,6 +12,7 @@ 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 */
 	int	gpio_cd;	/* or -EINVAL */
 	int	gpio_wp;	/* or -EINVAL */
 	char	*name;		/* or NULL for default */

arch/arm/plat-omap/include/mach/mmc.h

@@ -83,6 +83,9 @@ struct omap_mmc_platform_data {
 		/* use the internal clock */
 		unsigned internal_clock:1;
 
+		/* nonremovable e.g. eMMC */
+		unsigned nonremovable:1;
+
 		int switch_pin;			/* gpio (card detect) */
 		int gpio_wp;			/* gpio (write protect) */
 

drivers/mmc/host/omap_hsmmc.c

@@ -1390,6 +1390,9 @@ static int __init omap_mmc_probe(struct platform_device *pdev)
 	else if (pdata->slots[host->slot_id].wires >= 4)
 		mmc->caps |= MMC_CAP_4_BIT_DATA;
 
+	if (pdata->slots[host->slot_id].nonremovable)
+		mmc->caps |= MMC_CAP_NONREMOVABLE;
+
 	omap_hsmmc_init(host);
 
 	/* Select DMA lines */