rk30_phone:delete mpu3050 config and modify sensors orientation

diff --git a/arch/arm/configs/rk30_phone_defconfig b/arch/arm/configs/rk30_phone_defconfig
index f948a8df81adb15555578a6e8566fca10502fded..02c5565e61fde1aef03ad9b6b3ee439da9a01eab 100755 (executable)
--- a/arch/arm/configs/rk30_phone_defconfig
+++ b/arch/arm/configs/rk30_phone_defconfig
@@ -183,11 +183,6 @@ CONFIG_UID_STAT=y
 CONFIG_APANIC=y
 CONFIG_RK29_SC8800=y
 CONFIG_TDSC8800=y
-CONFIG_MPU_SENSORS_TIMERIRQ=y
-CONFIG_INV_SENSORS=y
-CONFIG_MPU_SENSORS_MMA845X=y
-CONFIG_MPU_SENSORS_AK8975=y
-# CONFIG_INV_SENSORS_PRESSURE is not set
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_SCSI_MULTI_LUN=y
@@ -226,9 +221,9 @@ CONFIG_INPUT_KEYCHORD=y
 CONFIG_INPUT_UINPUT=y
 CONFIG_INPUT_WM831X_ON=y
 CONFIG_MAG_SENSORS=y
+CONFIG_COMPASS_AK8975=y
 CONFIG_G_SENSOR_DEVICE=y
 # CONFIG_GS_MMA7660 is not set
-# CONFIG_GS_MMA8452 is not set
 CONFIG_GYRO_SENSOR_DEVICE=y
 CONFIG_LIGHT_SENSOR_DEVICE=y
 # CONFIG_SERIO is not set

diff --git a/arch/arm/mach-rk30/board-rk30-phone.c b/arch/arm/mach-rk30/board-rk30-phone.c
index 464e8f63c06fe0714efd4f8afa483c7c66097a9d..c7cbe28ab445aaf17eb6cd2b02c0a2510aa9f7fb 100755 (executable)
--- a/arch/arm/mach-rk30/board-rk30-phone.c
+++ b/arch/arm/mach-rk30/board-rk30-phone.c
@@ -898,7 +898,7 @@ static struct mma8452_platform_data mma8452_info = {
        .swap_xy = 0,
        .swap_xyz = 1,
        .init_platform_hw = mma8452_init_platform_hw,
-       .orientation = {-1, 0, 0, 0, 0, 1, 0, -1, 0},
+       .orientation = {0, -1, 0, 0, 0, -1, -1, 0, 0},
 };
 #endif
 #if defined (CONFIG_COMPASS_AK8975)
@@ -907,9 +907,9 @@ static struct akm8975_platform_data akm8975_info =
        .m_layout = 
        {
                {
+                       {0, 1, 0},
                        {-1, 0, 0},
-                       {0, 0, 1},
-                       {0, -1, 0},
+                       {0, 0, -1},
                },
 
                {
@@ -1397,7 +1397,7 @@ struct rk29_sdmmc_platform_data default_sdmmc0_data = {
 #else
        .use_dma = 0,
 #endif
-       .detect_irq = RK30_PIN3_PB6,    // INVALID_GPIO
+       .detect_irq = INVALID_GPIO,     // INVALID_GPIO
        .enable_sd_wakeup = 0,
 
 #if defined(CONFIG_SDMMC0_RK29_WRITE_PROTECT)
@@ -1577,7 +1577,7 @@ static struct i2c_board_info __initdata i2c0_info[] = {
 #if defined (CONFIG_GS_MMA8452)
        {
                .type           = "gs_mma8452",
-               .addr           = 0x1d,
+               .addr           = 0x1c,
                .flags          = 0,
                .irq            = MMA8452_INT_PIN,
                .platform_data = &mma8452_info,
@@ -1615,7 +1615,7 @@ static struct i2c_board_info __initdata i2c0_info[] = {
                .type                   = "mma845x",
                .addr           = 0x1c,
                .flags                  = 0,    
-               .irq                    = RK30_PIN4_PC3,
+               .irq                    = RK30_PIN4_PC0,
                .platform_data = &inv_mpu_mma845x_data,
        },
 #endif

diff --git a/drivers/input/touchscreen/ili2102_ts.c b/drivers/input/touchscreen/ili2102_ts.c
index fd64405c3e622a20541e79068748664f518e2b48..d898fe49683095345a12b0e706d1318e56417f88 100755 (executable)
--- a/drivers/input/touchscreen/ili2102_ts.c
+++ b/drivers/input/touchscreen/ili2102_ts.c
@@ -817,6 +817,8 @@ static int ili2102_ts_suspend(struct i2c_client *client, pm_message_t mesg)
        msg[0].flags = 0;
        msg[0].len = 1;
        msg[0].buf = buf;
+       msg[0].scl_rate =400*1000;
+       msg[0].udelay = 200;
 
        ret = i2c_transfer(client->adapter, msg, 1);
        if (ret < 0) {