aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-omap2/mmc-twl4030.c3
-rw-r--r--arch/arm/mach-omap2/mmc-twl4030.h1
-rw-r--r--arch/arm/plat-omap/include/mach/mmc.h3
-rw-r--r--drivers/mmc/host/omap_hsmmc.c3
4 files changed, 10 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.
diff --git a/arch/arm/mach-omap2/mmc-twl4030.h b/arch/arm/mach-omap2/mmc-twl4030.h
index 3807c45c9a6c..75b0c645cb3d 100644
--- a/arch/arm/mach-omap2/mmc-twl4030.h
+++ b/arch/arm/mach-omap2/mmc-twl4030.h
@@ -12,6 +12,7 @@ struct twl4030_hsmmc_info {
12 bool transceiver; /* MMC-2 option */ 12 bool transceiver; /* MMC-2 option */
13 bool ext_clock; /* use external pin for input clock */ 13 bool ext_clock; /* use external pin for input clock */
14 bool cover_only; /* No card detect - just cover switch */ 14 bool cover_only; /* No card detect - just cover switch */
15 bool nonremovable; /* Nonremovable e.g. eMMC */
15 int gpio_cd; /* or -EINVAL */ 16 int gpio_cd; /* or -EINVAL */
16 int gpio_wp; /* or -EINVAL */ 17 int gpio_wp; /* or -EINVAL */
17 char *name; /* or NULL for default */ 18 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 2f7cf31f9cd6..bab486ce5185 100644
--- a/arch/arm/plat-omap/include/mach/mmc.h
+++ b/arch/arm/plat-omap/include/mach/mmc.h
@@ -83,6 +83,9 @@ struct omap_mmc_platform_data {
83 /* use the internal clock */ 83 /* use the internal clock */
84 unsigned internal_clock:1; 84 unsigned internal_clock:1;
85 85
86 /* nonremovable e.g. eMMC */
87 unsigned nonremovable:1;
88
86 int switch_pin; /* gpio (card detect) */ 89 int switch_pin; /* gpio (card detect) */
87 int gpio_wp; /* gpio (write protect) */ 90 int gpio_wp; /* gpio (write protect) */
88 91
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index f588deff8b2c..a20c38385d2a 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -1390,6 +1390,9 @@ static int __init omap_mmc_probe(struct platform_device *pdev)
1390 else if (pdata->slots[host->slot_id].wires >= 4) 1390 else if (pdata->slots[host->slot_id].wires >= 4)
1391 mmc->caps |= MMC_CAP_4_BIT_DATA; 1391 mmc->caps |= MMC_CAP_4_BIT_DATA;
1392 1392
1393 if (pdata->slots[host->slot_id].nonremovable)
1394 mmc->caps |= MMC_CAP_NONREMOVABLE;
1395
1393 omap_hsmmc_init(host); 1396 omap_hsmmc_init(host);
1394 1397
1395 /* Select DMA lines */ 1398 /* Select DMA lines */