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

Commit 7fb2bbf4 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

MMC: MMCI: allow GPIOs to be passed 



Add and initialize the gpio_wp and gpio_cd members.  We need to
ensure that all users are covered, because GPIO 0 may be valid.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Acked-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
parent 012b7d33

arch/arm/include/asm/mach/mmc.h

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ struct mmc_platform_data { 
	unsigned int ocr_mask;			/* available voltages */

	u32 (*translate_vdd)(struct device *, unsigned int);

	unsigned int (*status)(struct device *);

	int	gpio_wp;

	int	gpio_cd;

};



#endif

arch/arm/mach-integrator/integrator_cp.c

+2 −0
Original line number Diff line number Diff line
@@ -403,6 +403,8 @@ static unsigned int mmc_status(struct device *dev) 
static struct mmc_platform_data mmc_data = {

	.ocr_mask	= MMC_VDD_32_33|MMC_VDD_33_34,

	.status		= mmc_status,

	.gpio_wp	= -1,

	.gpio_cd	= -1,

};



static struct amba_device mmc_device = {

arch/arm/mach-realview/core.c

+4 −0
Original line number Diff line number Diff line
@@ -238,11 +238,15 @@ static unsigned int realview_mmc_status(struct device *dev) 
struct mmc_platform_data realview_mmc0_plat_data = {

	.ocr_mask	= MMC_VDD_32_33|MMC_VDD_33_34,

	.status		= realview_mmc_status,

	.gpio_wp	= -1,

	.gpio_cd	= -1,

};



struct mmc_platform_data realview_mmc1_plat_data = {

	.ocr_mask	= MMC_VDD_32_33|MMC_VDD_33_34,

	.status		= realview_mmc_status,

	.gpio_wp	= -1,

	.gpio_cd	= -1,

};



/*

arch/arm/mach-u300/mmc.c

+2 −0
Original line number Diff line number Diff line
@@ -156,6 +156,8 @@ int __devinit mmc_init(struct amba_device *adev) 
	mmci_card->mmc0_plat_data.ocr_mask = MMC_VDD_28_29;

	mmci_card->mmc0_plat_data.translate_vdd = mmc_translate_vdd;

	mmci_card->mmc0_plat_data.status = mmc_status;

	mmci_card->mmc0_plat_data.gpio_wp = -1;

	mmci_card->mmc0_plat_data.gpio_cd = -1;



	mmcsd_device->platform_data = (void *) &mmci_card->mmc0_plat_data;

arch/arm/mach-versatile/core.c

+2 −0
Original line number Diff line number Diff line
@@ -373,6 +373,8 @@ unsigned int mmc_status(struct device *dev) 
static struct mmc_platform_data mmc0_plat_data = {

	.ocr_mask	= MMC_VDD_32_33|MMC_VDD_33_34,

	.status		= mmc_status,

	.gpio_wp	= -1,

	.gpio_cd	= -1,

};



/*