projects / firefly-linux-kernel-4.4.55.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f7f3af1)
SDMMC:
authorxbw <xbw@rock-chips.com>
Sun, 9 Dec 2012 11:13:58 +0000 (19:13 +0800)
committerxbw <xbw@rock-chips.com>
Sun, 9 Dec 2012 11:13:58 +0000 (19:13 +0800)
add the number of protective measures. to prevent some compile error due to the pin-value not defined.

arch/arm/mach-rk30/board-rk30-sdk.c patch | blob | history
arch/arm/mach-rk30/board-rk3066b-m701.c patch | blob | history
arch/arm/mach-rk30/board-rk3066b-sdk.c patch | blob | history

diff --git a/arch/arm/mach-rk30/board-rk30-sdk.c b/arch/arm/mach-rk30/board-rk30-sdk.c
index 63f53c593c643fcf90aaa0ff2c338cb33f192575..3020c12edb4636086f9035e3169ca4319262783e 100755 (executable)
--- a/arch/arm/mach-rk30/board-rk30-sdk.c
+++ b/arch/arm/mach-rk30/board-rk30-sdk.c
@@ -936,9 +936,13 @@ struct rk29_sdmmc_platform_data default_sdmmc0_data = {
     .register_status_notify = rk29sdk_wifi_mmc0_status_register,
 #endif
 
+#if defined(RK29SDK_SD_CARD_PWR_EN) || (INVALID_GPIO != RK29SDK_SD_CARD_PWR_EN)
     .power_en = RK29SDK_SD_CARD_PWR_EN,
     .power_en_level = RK29SDK_SD_CARD_PWR_EN_LEVEL,
-    
+#else
+    .power_en = INVALID_GPIO,
+    .power_en_level = GPIO_LOW,
+#endif    
        .enable_sd_wakeup = 0,
 
 #if defined(CONFIG_SDMMC0_RK29_WRITE_PROTECT)
@@ -948,15 +952,27 @@ struct rk29_sdmmc_platform_data default_sdmmc0_data = {
        .write_prt = INVALID_GPIO,
 #endif
 
-    .det_pin_info = {
+    .det_pin_info = {    
+    #if defined(RK29SDK_SD_CARD_DETECT_N) || (INVALID_GPIO != RK29SDK_SD_CARD_DETECT_N)  
         .io             = RK29SDK_SD_CARD_DETECT_N, //INVALID_GPIO,
         .enable         = RK29SDK_SD_CARD_INSERT_LEVEL,
+        #ifdef RK29SDK_SD_CARD_DETECT_PIN_NAME
         .iomux          = {
             .name       = RK29SDK_SD_CARD_DETECT_PIN_NAME,
+            #ifdef RK29SDK_SD_CARD_DETECT_IOMUX_FGPIO
             .fgpio      = RK29SDK_SD_CARD_DETECT_IOMUX_FGPIO,
+            #endif
+            #ifdef RK29SDK_SD_CARD_DETECT_IOMUX_FMUX
             .fmux       = RK29SDK_SD_CARD_DETECT_IOMUX_FMUX,
+            #endif
         },
-    },   
+        #endif
+    #else
+        .io             = INVALID_GPIO,
+        .enable         = GPIO_LOW,
+    #endif    
+    }, 
+
 };
 #endif // CONFIG_SDMMC0_RK29
 
@@ -1027,17 +1043,27 @@ 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          = {
             .name       = RK29SDK_SD_CARD_DETECT_PIN_NAME,
+            #ifdef RK29SDK_SD_CARD_DETECT_IOMUX_FGPIO
             .fgpio      = RK29SDK_SD_CARD_DETECT_IOMUX_FGPIO,
+            #endif
+            #ifdef RK29SDK_SD_CARD_DETECT_IOMUX_FMUX
             .fmux       = RK29SDK_SD_CARD_DETECT_IOMUX_FMUX,
+            #endif
         },
+        #endif
     }, 
     
        .enable_sd_wakeup = 0,
diff --git a/arch/arm/mach-rk30/board-rk3066b-m701.c b/arch/arm/mach-rk30/board-rk3066b-m701.c
index b03d6ecd7551b9fb9350f8a89267fdb96f4de364..62a65d671200a83335356621b37eae8879f407e3 100755 (executable)
--- a/arch/arm/mach-rk30/board-rk3066b-m701.c
+++ b/arch/arm/mach-rk30/board-rk3066b-m701.c
@@ -1019,9 +1019,13 @@ struct rk29_sdmmc_platform_data default_sdmmc0_data = {
     .register_status_notify = rk29sdk_wifi_mmc0_status_register,
 #endif
 
+#if defined(RK29SDK_SD_CARD_PWR_EN) || (INVALID_GPIO != RK29SDK_SD_CARD_PWR_EN)
     .power_en = RK29SDK_SD_CARD_PWR_EN,
     .power_en_level = RK29SDK_SD_CARD_PWR_EN_LEVEL,
-    
+#else
+    .power_en = INVALID_GPIO,
+    .power_en_level = GPIO_LOW,
+#endif    
        .enable_sd_wakeup = 0,
 
 #if defined(CONFIG_SDMMC0_RK29_WRITE_PROTECT)
@@ -1031,15 +1035,27 @@ struct rk29_sdmmc_platform_data default_sdmmc0_data = {
        .write_prt = INVALID_GPIO,
 #endif
 
-    .det_pin_info = {
+    .det_pin_info = {    
+    #if defined(RK29SDK_SD_CARD_DETECT_N) || (INVALID_GPIO != RK29SDK_SD_CARD_DETECT_N)  
         .io             = RK29SDK_SD_CARD_DETECT_N, //INVALID_GPIO,
         .enable         = RK29SDK_SD_CARD_INSERT_LEVEL,
+        #ifdef RK29SDK_SD_CARD_DETECT_PIN_NAME
         .iomux          = {
             .name       = RK29SDK_SD_CARD_DETECT_PIN_NAME,
+            #ifdef RK29SDK_SD_CARD_DETECT_IOMUX_FGPIO
             .fgpio      = RK29SDK_SD_CARD_DETECT_IOMUX_FGPIO,
+            #endif
+            #ifdef RK29SDK_SD_CARD_DETECT_IOMUX_FMUX
             .fmux       = RK29SDK_SD_CARD_DETECT_IOMUX_FMUX,
+            #endif
         },
-    },   
+        #endif
+    #else
+        .io             = INVALID_GPIO,
+        .enable         = GPIO_LOW,
+    #endif    
+    }, 
+
 };
 #endif // CONFIG_SDMMC0_RK29
 
@@ -1110,17 +1126,27 @@ 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          = {
             .name       = RK29SDK_SD_CARD_DETECT_PIN_NAME,
+            #ifdef RK29SDK_SD_CARD_DETECT_IOMUX_FGPIO
             .fgpio      = RK29SDK_SD_CARD_DETECT_IOMUX_FGPIO,
+            #endif
+            #ifdef RK29SDK_SD_CARD_DETECT_IOMUX_FMUX
             .fmux       = RK29SDK_SD_CARD_DETECT_IOMUX_FMUX,
+            #endif
         },
+        #endif
     }, 
     
        .enable_sd_wakeup = 0,
diff --git a/arch/arm/mach-rk30/board-rk3066b-sdk.c b/arch/arm/mach-rk30/board-rk3066b-sdk.c
index 03abe99aeaf706fe0ed6f66f702db626ac9d2ee7..4d7f31b6f4bd57031c37b1fc8e5a1b37a34d6481 100755 (executable)
--- a/arch/arm/mach-rk30/board-rk3066b-sdk.c
+++ b/arch/arm/mach-rk30/board-rk3066b-sdk.c
@@ -862,9 +862,13 @@ struct rk29_sdmmc_platform_data default_sdmmc0_data = {
     .register_status_notify = rk29sdk_wifi_mmc0_status_register,
 #endif
 
+#if defined(RK29SDK_SD_CARD_PWR_EN) || (INVALID_GPIO != RK29SDK_SD_CARD_PWR_EN)
     .power_en = RK29SDK_SD_CARD_PWR_EN,
     .power_en_level = RK29SDK_SD_CARD_PWR_EN_LEVEL,
-    
+#else
+    .power_en = INVALID_GPIO,
+    .power_en_level = GPIO_LOW,
+#endif    
        .enable_sd_wakeup = 0,
 
 #if defined(CONFIG_SDMMC0_RK29_WRITE_PROTECT)
@@ -874,15 +878,27 @@ struct rk29_sdmmc_platform_data default_sdmmc0_data = {
        .write_prt = INVALID_GPIO,
 #endif
 
-    .det_pin_info = {
+    .det_pin_info = {    
+    #if defined(RK29SDK_SD_CARD_DETECT_N) || (INVALID_GPIO != RK29SDK_SD_CARD_DETECT_N)  
         .io             = RK29SDK_SD_CARD_DETECT_N, //INVALID_GPIO,
         .enable         = RK29SDK_SD_CARD_INSERT_LEVEL,
+        #ifdef RK29SDK_SD_CARD_DETECT_PIN_NAME
         .iomux          = {
             .name       = RK29SDK_SD_CARD_DETECT_PIN_NAME,
+            #ifdef RK29SDK_SD_CARD_DETECT_IOMUX_FGPIO
             .fgpio      = RK29SDK_SD_CARD_DETECT_IOMUX_FGPIO,
+            #endif
+            #ifdef RK29SDK_SD_CARD_DETECT_IOMUX_FMUX
             .fmux       = RK29SDK_SD_CARD_DETECT_IOMUX_FMUX,
+            #endif
         },
-    },   
+        #endif
+    #else
+        .io             = INVALID_GPIO,
+        .enable         = GPIO_LOW,
+    #endif    
+    }, 
+
 };
 #endif // CONFIG_SDMMC0_RK29
 
@@ -953,17 +969,27 @@ 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          = {
             .name       = RK29SDK_SD_CARD_DETECT_PIN_NAME,
+            #ifdef RK29SDK_SD_CARD_DETECT_IOMUX_FGPIO
             .fgpio      = RK29SDK_SD_CARD_DETECT_IOMUX_FGPIO,
+            #endif
+            #ifdef RK29SDK_SD_CARD_DETECT_IOMUX_FMUX
             .fmux       = RK29SDK_SD_CARD_DETECT_IOMUX_FMUX,
+            #endif
         },
+        #endif
     }, 
     
        .enable_sd_wakeup = 0,
Unnamed repository; edit this file 'description' to name the repository.