From 0a7fdbc294147aa219e72435c46884dde2c7cc77 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E6=9D=A8=E4=BA=91?= Date: Mon, 30 Jan 2012 18:52:29 +0800 Subject: [PATCH] reset 04d70e6 and use board-rk29-ddr3sdk.c handle orientation --- arch/arm/mach-rk29/board-rk29-ddr3sdk.c | 5 +++-- drivers/input/gsensor/mma8452.c | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-rk29/board-rk29-ddr3sdk.c b/arch/arm/mach-rk29/board-rk29-ddr3sdk.c index 7dc556150064..7ac18e91acc5 100755 --- 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 0b3a789891bd..768bab64837b 100755 --- 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", -- 2.34.1