From: xbw <xbw@rock-chips.com>
Date: Fri, 10 Aug 2012 05:58:23 +0000 (+0800)
Subject: sdmmc: continue with commit b479d89814a79dc655f82642edb76af2a2236e6f.
X-Git-Tag: firefly_0821_release~8922^2~31
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a2809576eed3bb270f46465d9bd7c1f1564af1f4;p=firefly-linux-kernel-4.4.55.git

sdmmc: continue with commit b479d89814a79dc655f82642edb76af2a2236e6f.
---

diff --git a/arch/arm/mach-rk30/board-rk30-sdk-sdmmc.c b/arch/arm/mach-rk30/board-rk30-sdk-sdmmc.c
index 928959d0c514..817269750485 100755
--- a/arch/arm/mach-rk30/board-rk30-sdk-sdmmc.c
+++ b/arch/arm/mach-rk30/board-rk30-sdk-sdmmc.c
@@ -653,7 +653,7 @@ EXPORT_SYMBOL(rk29sdk_wifi_set_carddetect);
 
 
 
-#if 1//defined(CONFIG_WIFI_CONTROL_FUNC)
+#if defined(CONFIG_WIFI_CONTROL_FUNC)
 static struct wifi_platform_data rk29sdk_wifi_control = {
         .set_power = rk29sdk_wifi_power,
         .set_reset = rk29sdk_wifi_reset,
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index bb2c399c89b9..fabf9737c020 100755
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -54,6 +54,16 @@ if SDMMC_RK29
 			 You will add the feature of write-protect for sdio-card if you say Yes.
 			 Please note that this feature requires hardware support.
 			
+       config  RK29_SDIO_IRQ_FROM_GPIO
+         bool "sdio-irq from gpio"
+         default n
+         depends on SDMMC1_RK29
+         help
+            You will generate sdio interrupt from gpio if you say Yes.
+            Please note that this feature requires hardware support.
+
+
+
 #	config USE_SDMMC1_FOR_WIFI_DEVELOP_BOARD
 #	  depends on SDMMC1_RK29
 #		bool "Switch the driver SDMMC1 for the debug of wifi_develop_board."
diff --git a/drivers/mmc/host/rk29_sdmmc.c b/drivers/mmc/host/rk29_sdmmc.c
index 4b92b9ade2ba..d2d600ab7e53 100755
--- a/drivers/mmc/host/rk29_sdmmc.c
+++ b/drivers/mmc/host/rk29_sdmmc.c
@@ -3019,7 +3019,7 @@ static void rk29_sdmmc_tasklet_func(unsigned long priv)
     {
         host->errorstep = 0xf2;
 
-        if(12==host->cmd->opcode)
+        if(0) //(12==host->cmd->opcode)
         {
              printk(KERN_ERR "%d... cmd=%d(arg=0x%x),blksz=%d,blocks=%d,errorStep=0x%x,\n host->state=%x, statusReg=0x%x  [%s]\n",\
                  __LINE__,host->mrq->cmd->opcode, host->mrq->cmd->arg, host->mrq->cmd->data->blksz, host->mrq->cmd->data->blocks,\