Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23d99bb9 authored by Adrian Hunter's avatar Adrian Hunter Committed by Linus Torvalds
Browse files

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: default avatarAdrian Hunter <adrian.hunter@nokia.com>
Acked-by: default avatarMatt 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a3f406f8

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

+3 −0
Original line number Diff line number Diff line
@@ -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

+1 −0
Original line number Diff line number Diff line
@@ -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

+3 −0
Original line number Diff line number Diff line
@@ -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

+3 −0
Original line number Diff line number Diff line
@@ -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 */