aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/mmc-twl4030.c
diff options
context:
space:
mode:
authorAdrian Hunter <adrian.hunter@nokia.com>2009-09-22 19:44:48 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-23 10:39:35 -0400
commit23d99bb923fc23aeb1086d60eb1c70602b4e2036 (patch)
treeb0c75213a4baa94f31460ed9406bb40e4918443f /arch/arm/mach-omap2/mmc-twl4030.c
parenta3f406f861456987c9fce8cfa0a00d07b16cdec0 (diff)
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> Acked-by: Matt Fleming <matt@console-pimps.org> Cc: Ian Molton <ian@mnementh.co.uk> Cc: "Roberto A. Foglietta" <roberto.foglietta@gmail.com> Cc: Jarkko Lavinen <jarkko.lavinen@nokia.com> Cc: Denis Karpov <ext-denis.2.karpov@nokia.com> Cc: Pierre Ossman <pierre@ossman.eu> Cc: Philip Langdale <philipl@overt.org> Cc: "Madhusudhan" <madhu.cr@ti.com> Cc: <linux-mmc@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/arm/mach-omap2/mmc-twl4030.c')
-rw-r--r--arch/arm/mach-omap2/mmc-twl4030.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/mmc-twl4030.c
index 30d028627c5b..56f07f26f753 100644
--- a/arch/arm/mach-omap2/mmc-twl4030.c
+++ b/arch/arm/mach-omap2/mmc-twl4030.c
@@ -415,6 +415,9 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers)
415 } else 415 } else
416 mmc->slots[0].gpio_wp = -EINVAL; 416 mmc->slots[0].gpio_wp = -EINVAL;
417 417
418 if (c->nonremovable)
419 mmc->slots[0].nonremovable = 1;
420
418 /* NOTE: MMC slots should have a Vcc regulator set up. 421 /* NOTE: MMC slots should have a Vcc regulator set up.
419 * This may be from a TWL4030-family chip, another 422 * This may be from a TWL4030-family chip, another
420 * controllable regulator, or a fixed supply. 423 * controllable regulator, or a fixed supply.