diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-07-09 15:17:41 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-02 11:21:14 +0100 |
| commit | 98b0979f025e5b98ce8f24e6dc0f9713e6f6c88c (patch) | |
| tree | 04047cbd43c20ca79f20f851656763c31578aab3 | |
| parent | 7064d2092df5cbff289457424969292bc4062df4 (diff) | |
| download | kernel-crypto-98b0979f025e5b98ce8f24e6dc0f9713e6f6c88c.tar.gz kernel-crypto-98b0979f025e5b98ce8f24e6dc0f9713e6f6c88c.tar.xz kernel-crypto-98b0979f025e5b98ce8f24e6dc0f9713e6f6c88c.zip | |
MMC: MMCI: convert realview MMC to use gpiolib
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mach-realview/core.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c index 17a07e6acfa..ab615e78b79 100644 --- a/arch/arm/mach-realview/core.c +++ b/arch/arm/mach-realview/core.c @@ -222,6 +222,9 @@ arch_initcall(realview_i2c_init); #define REALVIEW_SYSMCI (__io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_MCI_OFFSET) +/* + * This is only used if GPIOLIB support is disabled + */ static unsigned int realview_mmc_status(struct device *dev) { struct amba_device *adev = container_of(dev, struct amba_device, dev); @@ -238,15 +241,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, + .gpio_wp = 17, + .gpio_cd = 16, }; 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, + .gpio_wp = 19, + .gpio_cd = 18, }; /* |