reset 04d70e6 and use board-rk29-ddr3sdk.c handle orientation

diff --git a/arch/arm/mach-rk29/board-rk29-ddr3sdk.c b/arch/arm/mach-rk29/board-rk29-ddr3sdk.c
index 7dc556150064009f31812c825724db5dd434715d..7ac18e91acc590257edee825cb3dd86bd82d0d26 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29-ddr3sdk.c
+++ b/arch/arm/mach-rk29/board-rk29-ddr3sdk.c
@@ -990,9 +990,10 @@ static int mma8452_init_platform_hw(void)
 
 static struct mma8452_platform_data mma8452_info = {
   .model= 8452,
-  .swap_xy = 1,
+  .swap_xy = 0,
+  .swap_xyz = 1,
   .init_platform_hw= mma8452_init_platform_hw,
-
+  .orientation = { -1, 0, 0, 0, 0, 1, 0, -1, 0},
 };
 #endif
 /*mpu3050*/

diff --git a/drivers/input/gsensor/mma8452.c b/drivers/input/gsensor/mma8452.c
index 0b3a789891bd7be94f0d234cb813013a0c944158..768bab64837b7c4f311c3d4507105b7f2320e8ce 100755 (executable)
--- a/drivers/input/gsensor/mma8452.c
+++ b/drivers/input/gsensor/mma8452.c
@@ -390,9 +390,8 @@ static int mma8452_get_data(struct i2c_client *client)
 
        if(pdata->swap_xy)
        {
-                axis.x = -x;
-                axis.y = z;
-                axis.z = -y;
+             axis.x = -axis.x;
+             swap(axis.x,axis.y); 
        }
        
     mmaprintkd( "%s: ------------------mma8452_GetData axis = %d  %d  %d--------------\n",