omap_hsmmc: make use of new MMC_CAP_NONREMOVABLE host capability
Subsystems (5)
PATCH 59/232 omap_hsmmc: make use of new MMC_CAP_NONREMOVABLE host capability
From: Adrian Hunter <[email protected]>
Let the board specify that a card is nonremovable e.g. eMMC
Signed-off-by Adrian Hunter <[email protected]>
Acked-by Matt Fleming <[email protected]>
Cc Ian Molton <[email protected]>
Cc "Roberto A. Foglietta" <[email protected]>
Cc Jarkko Lavinen <[email protected]>
Cc Denis Karpov <[email protected]>
Cc Pierre Ossman <[email protected]>
Cc Philip Langdale <[email protected]>
Cc "Madhusudhan" <[email protected]>
Cc <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
arch/arm/mach-omap2/mmc-twl4030.c | 3 +++ arch/arm/mach-omap2/mmc-twl4030.h | 1 + arch/arm/plat-omap/include/mach/mmc.h | 3 +++ drivers/mmc/host/omap_hsmmc.c | 3 +++ 4 files changed, 10 insertions(+)
arch/arm/mach-omap2/mmc-twl4030.c renamed from arch/arm/mach-omap2/mmc-twl4030.c~omap_hsmmc-make-use-of-new-mmc_cap_nonremovable-host-capability +3 -0
@@ -415,6 +415,9 @@ void __init twl4030_mmc_init(struct twl4 }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 renamed from arch/arm/mach-omap2/mmc-twl4030.h~omap_hsmmc-make-use-of-new-mmc_cap_nonremovable-host-capability +1 -0
@@ -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 renamed from arch/arm/plat-omap/include/mach/mmc.h~omap_hsmmc-make-use-of-new-mmc_cap_nonremovable-host-capability +3 -0
@@ -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 renamed from drivers/mmc/host/omap_hsmmc.c~omap_hsmmc-make-use-of-new-mmc_cap_nonremovable-host-capability +3 -0
@@ -1390,6 +1390,9 @@ static int __init omap_mmc_probe(structelse 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 */
_