rk29 phonesdk: gpio config for ak8975 and bt

diff --git a/arch/arm/mach-rk29/board-rk29-phonesdk-rfkill.c b/arch/arm/mach-rk29/board-rk29-phonesdk-rfkill.c
index b28a5523a5c015ada65ef322783df5583e407037..2636ea516ba1ddbb8695b4f39d9afe73f3cd3ac8 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29-phonesdk-rfkill.c
+++ b/arch/arm/mach-rk29/board-rk29-phonesdk-rfkill.c
@@ -46,7 +46,7 @@ struct bt_ctrl
 #define BT_GPIO_POWER           RK29_PIN5_PD6
 #define IOMUX_BT_GPIO_POWER     rk29_mux_api_set(GPIO5D6_SDMMC1PWREN_NAME, GPIO5H_GPIO5D6);
 #define BT_GPIO_RESET                  RK29_PIN6_PC4
-#define BT_GPIO_WAKE_UP         RK29_PIN6_PC5
+#define BT_GPIO_WAKE_UP         RK29_PIN6_PD0
 #define BT_GPIO_WAKE_UP_HOST    //RK2818_PIN_PA7
 #define IOMUX_BT_GPIO_WAKE_UP_HOST() //rk2818_mux_api_set(GPIOA7_FLASHCS3_SEL_NAME,0);
 

diff --git a/arch/arm/mach-rk29/board-rk29-phonesdk.c b/arch/arm/mach-rk29/board-rk29-phonesdk.c
old mode 100644 (file)
new mode 100755 (executable)
index e1502c7..944f7b2
--- a/arch/arm/mach-rk29/board-rk29-phonesdk.c
+++ b/arch/arm/mach-rk29/board-rk29-phonesdk.c
@@ -1514,7 +1514,7 @@ static struct i2c_board_info __initdata board_i2c0_devices[] = {
                .type                   = "ak8973",
                .addr           = 0x1d,
                .flags                  = 0,
-               .irq                    = RK29_PIN0_PA4,
+               .irq                    = RK29_PIN6_PC5,
        },
 #endif
 #if defined (CONFIG_COMPASS_AK8975)
@@ -1522,7 +1522,7 @@ static struct i2c_board_info __initdata board_i2c0_devices[] = {
                .type                   = "ak8975",
                .addr           = 0x0d,
                .flags                  = 0,
-               .irq                    = RK29_PIN0_PA4,
+               .irq                    = RK29_PIN6_PC5,
        },
 #endif
 #if defined (CONFIG_INPUT_LPSENSOR_ISL29028)