modify the error iomux

diff --git a/arch/arm/mach-rk30/include/mach/iomux.h b/arch/arm/mach-rk30/include/mach/iomux.h
index 7a3385bcfb1f0a1ba55c070c364f9890d769c5e3..f6dc3c81cd1d64998cfa1775cb4a294a4c7fa4e2 100755 (executable)
--- a/arch/arm/mach-rk30/include/mach/iomux.h
+++ b/arch/arm/mach-rk30/include/mach/iomux.h
@@ -309,7 +309,7 @@
 
 //GPIO3A
 #define GPIO3A_GPIO3A7                         0 
-#define GPIO3A_SDMMC0_WRITE_PRT                        1 
+#define GPIO3A_SDMMC0_PWR_EN           1   //#define GPIO3A_SDMMC0_WRITE_PRT 1 //Modifyed by xbw,at 2012-03-05
 #define GPIO3A_GPIO3A6                         0 
 #define GPIO3A_SDMMC0_RSTN_OUT                 1 
 #define GPIO3A_GPIO3A5                         0 
@@ -712,7 +712,8 @@
 
 
 //GPIO3A
-#define GPIO3A7_SDMMC0WRITEPRT_NAME                    "gpio3a7_sdmmc0writeprt_name" 
+//#define GPIO3A7_SDMMC0WRITEPRT_NAME                  "gpio3a7_sdmmc0writeprt_name" 
+#define GPIO3A7_SDMMC0PWREN_NAME                       "gpio3a70_sdmmc0pwren_name"  //Modifyed by xbw,at 2012-03-05
 #define GPIO3A6_SDMMC0RSTNOUT_NAME                     "gpio3a6_sdmmc0rstnout_name" 
 #define GPIO3A5_I2C4SCL_NAME                           "gpio3a5_i2c4scl_name" 
 #define GPIO3A4_I2C4SDA_NAME                           "gpio3a4_i2c4sda_name" 

diff --git a/arch/arm/mach-rk30/iomux.c b/arch/arm/mach-rk30/iomux.c
index 7f427450fb644703520a4e3b0d60e7cd941f0b2a..e6887d85f953ea98394128a2dee5cdfcf867588c 100755 (executable)
--- a/arch/arm/mach-rk30/iomux.c
+++ b/arch/arm/mach-rk30/iomux.c
@@ -150,7 +150,9 @@ MUX_CFG(GPIO2D1_LCDC1DEN_SMCCSN1_NAME,                      GPIO2D,   2,     2,   0,        DEFAULT)
 MUX_CFG(GPIO2D0_LCDC1DCLK_NAME,                        GPIO2D,   0,     2,   0,        DEFAULT) 
 
 //GPIO3A
-MUX_CFG(GPIO3A7_SDMMC0WRITEPRT_NAME,                   GPIO3A,   14,    2,   0,        DEFAULT) 
+//MUX_CFG(GPIO3A7_SDMMC0WRITEPRT_NAME,                 GPIO3A,   14,    2,   0,        DEFAULT)
+MUX_CFG(GPIO3A7_SDMMC0PWREN_NAME,                      GPIO3A,   14,    2,   0,        DEFAULT) //Modifyed by xbw,at 2012-03-05
+
 MUX_CFG(GPIO3A6_SDMMC0RSTNOUT_NAME,                    GPIO3A,   12,    2,   0,        DEFAULT) 
 MUX_CFG(GPIO3A5_I2C4SCL_NAME,                          GPIO3A,   10,    2,   0,        DEFAULT) 
 MUX_CFG(GPIO3A4_I2C4SDA_NAME,                          GPIO3A,   8,     2,   0,        DEFAULT)