diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-07-09 16:15:12 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-07-09 16:15:12 +0200 |
| commit | 7fb2bbf4d9e7e62057184f1e061566459eef6c79 (patch) | |
| tree | e67c4c6780246bca649fac652f83116785ee855e /arch/arm/mach-u300 | |
| parent | MMC: MMCI: use AMBA bus accessors (diff) | |
| download | linux-7fb2bbf4d9e7e62057184f1e061566459eef6c79.tar.xz linux-7fb2bbf4d9e7e62057184f1e061566459eef6c79.zip | |
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>
Diffstat (limited to 'arch/arm/mach-u300')
| -rw-r--r-- | arch/arm/mach-u300/mmc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-u300/mmc.c b/arch/arm/mach-u300/mmc.c index 3138d3955c9e..585cc013639d 100644 --- a/arch/arm/mach-u300/mmc.c +++ b/arch/arm/mach-u300/mmc.c @@ -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; |