From: xbw <xbw@rock-chips.com>
Date: Sun, 9 Dec 2012 11:35:32 +0000 (+0800)
Subject: SDMMC: to To shield some debugging code
X-Git-Tag: firefly_0821_release~8117^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3df852b708068e3c1bf0afb2cd2ba875d6ec766c;p=firefly-linux-kernel-4.4.55.git

SDMMC: to To shield some debugging code
---

diff --git a/arch/arm/mach-rk30/board-rk30-sdk.c b/arch/arm/mach-rk30/board-rk30-sdk.c
index 3020c12edb46..126f4e9f151f 100755
--- a/arch/arm/mach-rk30/board-rk30-sdk.c
+++ b/arch/arm/mach-rk30/board-rk30-sdk.c
@@ -1043,15 +1043,13 @@ struct rk29_sdmmc_platform_data default_sdmmc1_data = {
     #endif
 
     .det_pin_info = {    
-#if !defined(CONFIG_USE_SDMMC1_FOR_WIFI_DEVELOP_BOARD)
+#if defined(CONFIG_USE_SDMMC1_FOR_WIFI_DEVELOP_BOARD)
      #if defined(RK29SDK_SD_CARD_DETECT_N) || (INVALID_GPIO != RK29SDK_SD_CARD_DETECT_N)  
         .io             = RK29SDK_SD_CARD_DETECT_N,
      #else
          .io             = INVALID_GPIO,
      #endif   
-#else
-        .io             = INVALID_GPIO,
-#endif
+
         .enable         = RK29SDK_SD_CARD_INSERT_LEVEL,
         #ifdef RK29SDK_SD_CARD_DETECT_PIN_NAME
         .iomux          = {
@@ -1064,8 +1062,12 @@ struct rk29_sdmmc_platform_data default_sdmmc1_data = {
             #endif
         },
         #endif
-    }, 
-    
+ #else
+        .io             = INVALID_GPIO,
+        .enable         = GPIO_LOW,
+#endif
+    },
+   
 	.enable_sd_wakeup = 0,
 };
 #endif //endif--#ifdef CONFIG_SDMMC1_RK29
diff --git a/arch/arm/mach-rk30/board-rk3066b-m701.c b/arch/arm/mach-rk30/board-rk3066b-m701.c
index 62a65d671200..a07470feb28b 100755
--- a/arch/arm/mach-rk30/board-rk3066b-m701.c
+++ b/arch/arm/mach-rk30/board-rk3066b-m701.c
@@ -1126,15 +1126,13 @@ struct rk29_sdmmc_platform_data default_sdmmc1_data = {
     #endif
 
     .det_pin_info = {    
-#if !defined(CONFIG_USE_SDMMC1_FOR_WIFI_DEVELOP_BOARD)
+#if defined(CONFIG_USE_SDMMC1_FOR_WIFI_DEVELOP_BOARD)
      #if defined(RK29SDK_SD_CARD_DETECT_N) || (INVALID_GPIO != RK29SDK_SD_CARD_DETECT_N)  
         .io             = RK29SDK_SD_CARD_DETECT_N,
      #else
          .io             = INVALID_GPIO,
      #endif   
-#else
-        .io             = INVALID_GPIO,
-#endif
+
         .enable         = RK29SDK_SD_CARD_INSERT_LEVEL,
         #ifdef RK29SDK_SD_CARD_DETECT_PIN_NAME
         .iomux          = {
@@ -1147,8 +1145,12 @@ struct rk29_sdmmc_platform_data default_sdmmc1_data = {
             #endif
         },
         #endif
-    }, 
-    
+ #else
+        .io             = INVALID_GPIO,
+        .enable         = GPIO_LOW,
+#endif
+    },
+   
 	.enable_sd_wakeup = 0,
 };
 #endif //endif--#ifdef CONFIG_SDMMC1_RK29
diff --git a/arch/arm/mach-rk30/board-rk3066b-sdk.c b/arch/arm/mach-rk30/board-rk3066b-sdk.c
index 4d7f31b6f4bd..e63803a73468 100755
--- a/arch/arm/mach-rk30/board-rk3066b-sdk.c
+++ b/arch/arm/mach-rk30/board-rk3066b-sdk.c
@@ -969,15 +969,13 @@ struct rk29_sdmmc_platform_data default_sdmmc1_data = {
     #endif
 
     .det_pin_info = {    
-#if !defined(CONFIG_USE_SDMMC1_FOR_WIFI_DEVELOP_BOARD)
+#if defined(CONFIG_USE_SDMMC1_FOR_WIFI_DEVELOP_BOARD)
      #if defined(RK29SDK_SD_CARD_DETECT_N) || (INVALID_GPIO != RK29SDK_SD_CARD_DETECT_N)  
         .io             = RK29SDK_SD_CARD_DETECT_N,
      #else
          .io             = INVALID_GPIO,
      #endif   
-#else
-        .io             = INVALID_GPIO,
-#endif
+
         .enable         = RK29SDK_SD_CARD_INSERT_LEVEL,
         #ifdef RK29SDK_SD_CARD_DETECT_PIN_NAME
         .iomux          = {
@@ -990,8 +988,12 @@ struct rk29_sdmmc_platform_data default_sdmmc1_data = {
             #endif
         },
         #endif
-    }, 
-    
+ #else
+        .io             = INVALID_GPIO,
+        .enable         = GPIO_LOW,
+#endif
+    },
+   
 	.enable_sd_wakeup = 0,
 };
 #endif //endif--#ifdef CONFIG_SDMMC1_RK29