UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Adrian Hunter 2009-09-22 16:44:48 -07:00 committed by Linus Torvalds
parent a3f406f861
commit 23d99bb923
4 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-omap2/mmc-twl4030.c
View File

@ -415,6 +415,9 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers)
} else } else
mmc->slots[0].gpio_wp = -EINVAL; mmc->slots[0].gpio_wp = -EINVAL;
if (c->nonremovable)
mmc->slots[0].nonremovable = 1;
/* NOTE: MMC slots should have a Vcc regulator set up. /* NOTE: MMC slots should have a Vcc regulator set up.
* This may be from a TWL4030-family chip, another * This may be from a TWL4030-family chip, another
* controllable regulator, or a fixed supply. * controllable regulator, or a fixed supply.

1
arch/arm/mach-omap2/mmc-twl4030.h
View File

@ -12,6 +12,7 @@ struct twl4030_hsmmc_info {
bool transceiver; /* MMC-2 option */ bool transceiver; /* MMC-2 option */
bool ext_clock; /* use external pin for input clock */ bool ext_clock; /* use external pin for input clock */
bool cover_only; /* No card detect - just cover switch */ bool cover_only; /* No card detect - just cover switch */
bool nonremovable; /* Nonremovable e.g. eMMC */
int gpio_cd; /* or -EINVAL */ int gpio_cd; /* or -EINVAL */
int gpio_wp; /* or -EINVAL */ int gpio_wp; /* or -EINVAL */
char *name; /* or NULL for default */ char *name; /* or NULL for default */

3
arch/arm/plat-omap/include/mach/mmc.h
View File

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

3
drivers/mmc/host/omap_hsmmc.c
View File

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