update fih key and board

diff --git a/arch/arm/mach-rk29/board-rk29-fih-key.c b/arch/arm/mach-rk29/board-rk29-fih-key.c
index 8e35456b576a2388e0a51c0619fc8ba8195a33d3..633f2bfe7c54e6bd640267e74e9f292babecff82 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29-fih-key.c
+++ b/arch/arm/mach-rk29/board-rk29-fih-key.c
@@ -9,12 +9,6 @@
 #define PRESS_LEV_HIGH                 0
 
 static struct rk29_keys_button key_button[] = {
-       {
-               .desc   = "menu",
-               .code   = EV_MENU,
-               .gpio   = RK29_PIN6_PA0,
-               .active_low = PRESS_LEV_LOW,
-       },
        {
                .desc   = "vol+",
                .code   = KEY_VOLUMEUP,
@@ -27,30 +21,6 @@ static struct rk29_keys_button key_button[] = {
                .gpio   = RK29_PIN6_PA2,
                .active_low = PRESS_LEV_LOW,
        },
-       {
-               .desc   = "home",
-               .code   = KEY_HOME,
-               .gpio   = RK29_PIN6_PA3,
-               .active_low = PRESS_LEV_LOW,
-       },
-       {
-               .desc   = "search",
-               .code   = KEY_SEARCH,
-               .gpio   = RK29_PIN6_PA4,
-               .active_low = PRESS_LEV_LOW,
-       },
-       {
-               .desc   = "esc",
-               .code   = KEY_BACK,
-               .gpio   = RK29_PIN6_PA5,
-               .active_low = PRESS_LEV_LOW,
-       },
-       {
-               .desc   = "sensor",
-               .code   = KEY_CAMERA,
-               .gpio   = RK29_PIN6_PA6,
-               .active_low = PRESS_LEV_LOW,
-       },
        {
                .desc   = "play",
                .code   = KEY_POWER,

diff --git a/arch/arm/mach-rk29/board-rk29-fih.c b/arch/arm/mach-rk29/board-rk29-fih.c
index 911d6a467af672609e40a3e3205c8ec3d347f2e9..6aaa4832cb0323de985c620acf4283217bab0578 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29-fih.c
+++ b/arch/arm/mach-rk29/board-rk29-fih.c
@@ -985,14 +985,6 @@ static struct i2c_board_info __initdata board_i2c0_devices[] = {
                .irq                    = RK29_PIN0_PA4,
        },
 #endif
-#if 0//defined (CONFIG_SENSORS_AK8975)
-       {
-               .type                   = "ak8975",
-               .addr           = 0x0d,
-               .flags                  = 0,
-               .irq                    = RK29_PIN0_PA4,
-       },
-#endif
 /*mpu3050*/
 #if defined (CONFIG_SENSORS_MPU3050) 
        {
@@ -1608,7 +1600,7 @@ static int rk29_sdmmc0_cfg_gpio(void)
        rk29_mux_api_set(GPIO1D3_SDMMC0DATA1_NAME, GPIO1H_SDMMC0_DATA1);
        rk29_mux_api_set(GPIO1D4_SDMMC0DATA2_NAME, GPIO1H_SDMMC0_DATA2);
        rk29_mux_api_set(GPIO1D5_SDMMC0DATA3_NAME, GPIO1H_SDMMC0_DATA3);
-       rk29_mux_api_set(GPIO2A2_SDMMC0DETECTN_NAME, GPIO2L_SDMMC0_DETECT_N);
+       rk29_mux_api_set(GPIO2A2_SDMMC0DETECTN_NAME, GPIO2L_GPIO2A2);
        rk29_mux_api_set(GPIO5D5_SDMMC0PWREN_NAME, GPIO5H_GPIO5D5);   ///GPIO5H_SDMMC0_PWR_EN);  ///GPIO5H_GPIO5D5);
        gpio_request(RK29_PIN5_PD5,"sdmmc");
 #if 0
@@ -1634,7 +1626,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