mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 17:01:14 +00:00
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: Russell King <rmk+kernel@arm.linux.org.uk> Acked-by: Linus Walleij <linus.walleij@stericsson.com>
This commit is contained in:
parent
012b7d339c
commit
7fb2bbf4d9
6 changed files with 14 additions and 0 deletions
|
@ -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
|
||||
|
|
|
@ -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 = {
|
||||
|
|
|
@ -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,
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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,
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
@ -44,6 +44,8 @@
|
|||
static struct mmc_platform_data mmc1_plat_data = {
|
||||
.ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
|
||||
.status = mmc_status,
|
||||
.gpio_wp = -1,
|
||||
.gpio_cd = -1,
|
||||
};
|
||||
|
||||
static struct pl061_platform_data gpio2_plat_data = {
|
||||
|
|
Loading…
Reference in a new issue