summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-integrator
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-07-09 16:15:12 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-07-09 16:15:12 +0200
commit7fb2bbf4d9e7e62057184f1e061566459eef6c79 (patch)
treee67c4c6780246bca649fac652f83116785ee855e /arch/arm/mach-integrator
parentMMC: MMCI: use AMBA bus accessors (diff)
downloadlinux-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-integrator')
-rw-r--r--arch/arm/mach-integrator/integrator_cp.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index 4ac04055c2ea..69956cdae3c2 100644
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -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 = {