From: "Zhao, Gang" <gamer...@gmail.com>
Related upstream changes: v3.12-rc1~69^2~23 ("mmc: mmc_spi: Remove
platform data .get_cd() and .get_ro() callbacks") and
v3.12-rc1~21^2~25 ("mmc: mmc_spi: Support CD/RO GPIOs").
Signed-off-by: Zhao, Gang <gang.zhao...@gmail.com>
---
target/linux/ar71xx/files-3.14/arch/mips/ath79/mach-alfa-ap96.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/target/linux/ar71xx/files-3.14/arch/mips/ath79/mach-alfa-ap96.c
b/target/linux/ar71xx/files-3.14/arch/mips/ath79/mach-alfa-ap96.c
index 15abb08..f7cd6ae 100644
--- a/target/linux/ar71xx/files-3.14/arch/mips/ath79/mach-alfa-ap96.c
+++ b/target/linux/ar71xx/files-3.14/arch/mips/ath79/mach-alfa-ap96.c
@@ -48,13 +48,10 @@ static struct gpio_keys_button alfa_ap96_gpio_keys[]
__initdata = {
}
};
-static int alfa_ap96_mmc_get_cd(struct device *dev)
-{
- return !gpio_get_value(ALFA_AP96_GPIO_MICROSD_CD);
-}
-
static struct mmc_spi_platform_data alfa_ap96_mmc_data = {
- .get_cd = alfa_ap96_mmc_get_cd,
+ .flags = MMC_SPI_USE_CD_GPIO,
+ .cd_gpio = ALFA_AP96_GPIO_MICROSD_CD,
+ .cd_debounce = 1,
.caps = MMC_CAP_NEEDS_POLL,
.ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,
};
--
1.9.3
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
