From: hzf <root@hzf-HP-Compaq-dx7518-MT.(none)>
Date: Tue, 9 Oct 2012 11:17:49 +0000 (+0800)
Subject: rk2928_phone_pad:add sd card support
X-Git-Tag: firefly_0821_release~8462
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ab19a50b4d3913b09dc525fef1c311d261a89f07;p=firefly-linux-kernel-4.4.55.git

rk2928_phone_pad:add sd card support
---

diff --git a/arch/arm/configs/rk2928_phonepad_defconfig b/arch/arm/configs/rk2928_phonepad_defconfig
index d57755364fb4..92508e9da614 100644
--- a/arch/arm/configs/rk2928_phonepad_defconfig
+++ b/arch/arm/configs/rk2928_phonepad_defconfig
@@ -378,6 +378,7 @@ CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_EMBEDDED_SDIO=y
 CONFIG_MMC_PARANOID_SD_INIT=y
 CONFIG_SDMMC_RK29=y
+CONFIG_SDMMC0_RK29_SDCARD_DET_FROM_GPIO=y
 CONFIG_SWITCH=y
 CONFIG_SWITCH_GPIO=y
 CONFIG_RTC_CLASS=y
diff --git a/arch/arm/mach-rk2928/board-rk2928-phonepad.c b/arch/arm/mach-rk2928/board-rk2928-phonepad.c
index 9212825f7751..b85cd2e3db8e 100755
--- a/arch/arm/mach-rk2928/board-rk2928-phonepad.c
+++ b/arch/arm/mach-rk2928/board-rk2928-phonepad.c
@@ -585,7 +585,7 @@ struct rk29_sdmmc_platform_data default_sdmmc0_data = {
 #else
 	.use_dma = 0,
 #endif
-	.detect_irq = RK2928_PIN1_PC1,	// INVALID_GPIO
+	.detect_irq =  INVALID_GPIO,
 	.enable_sd_wakeup = 0,
 
 #if defined(CONFIG_SDMMC0_RK29_WRITE_PROTECT)