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

Commit 6fdc75de authored by Eliad Peller's avatar Eliad Peller Committed by Tony Lindgren
Browse files

ARM: OMAP: hsmmc: add pm_caps field 



Add pm_caps field to omap2_hsmmc_info and omap_mmc_slot_data
structs, so we will be able to indicate mmc pm capabilities
in the board file.

Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 31f9d463

arch/arm/mach-omap2/hsmmc.c

+1 −0
Original line number Diff line number Diff line
@@ -296,6 +296,7 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c, 
	mmc->slots[0].name = hc_name;

	mmc->nr_slots = 1;

	mmc->slots[0].caps = c->caps;

	mmc->slots[0].pm_caps = c->pm_caps;

	mmc->slots[0].internal_clock = !c->ext_clock;

	mmc->dma_mask = 0xffffffff;

	if (cpu_is_omap44xx())

arch/arm/mach-omap2/hsmmc.h

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ struct omap2_hsmmc_info { 
	u8	mmc;		/* controller 1/2/3 */

	u32	caps;		/* 4/8 wires and any additional host

				 * capabilities OR'd (ref. linux/mmc/host.h) */

	u32	pm_caps;	/* PM capabilities */

	bool	transceiver;	/* MMC-2 option */

	bool	ext_clock;	/* use external pin for input clock */

	bool	cover_only;	/* No card detect - just cover switch */

arch/arm/plat-omap/include/plat/mmc.h

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ struct omap_mmc_platform_data { 
		 */

		u8  wires;	/* Used for the MMC driver on omap1 and 2420 */

		u32 caps;	/* Used for the MMC driver on 2430 and later */

		u32 pm_caps;	/* PM capabilities of the mmc */



		/*

		 * nomux means "standard" muxing is wrong on this board, and

drivers/mmc/host/omap_hsmmc.c

+2 −0
Original line number Diff line number Diff line
@@ -1988,6 +1988,8 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev) 
	if (mmc_slot(host).nonremovable)

		mmc->caps |= MMC_CAP_NONREMOVABLE;



	mmc->pm_caps = mmc_slot(host).pm_caps;



	omap_hsmmc_conf_bus_power(host);



	/* Select DMA lines */