Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop

arch/arm/configs/rk29_sdk_defconfig

@@ -1564,7 +1564,7 @@ CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_EMBEDDED_SDIO=y
-CONFIG_MMC_PARANOID_SD_INIT=y
+# CONFIG_MMC_PARANOID_SD_INIT is not set
 
 #
 # MMC/SD/SDIO Card Drivers

arch/arm/mach-rk29/board-rk29sdk.c

@@ -1210,7 +1210,8 @@ struct rk29_sdmmc_platform_data default_sdmmc0_data = {
 #else
 	.use_dma = 0,
 #endif
-	.detect_irq = RK29_PIN2_PA2 // INVALID_GPIO
+	.detect_irq = RK29_PIN2_PA2, // INVALID_GPIO
+	.enable_sd_wakeup = 0,
 };
 #endif
 #ifdef CONFIG_SDMMC1_RK29

arch/arm/mach-rk29/include/mach/board.h

@@ -108,6 +108,7 @@ struct rk29_sdmmc_platform_data {
 	int (*status)(struct device *);
 	int (*register_status_notify)(void (*callback)(int card_present, void *dev_id), void *dev_id);
         int detect_irq;
+		int enable_sd_wakeup;
 };
 struct rk29_i2c_platform_data {
 	int     bus_num;