From 0500b7e79dc5e56900c358a54c071d15bced06e0 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 29 Apr 2011 10:48:24 +0800 Subject: [PATCH] xxm FIH:update touchkey_led && touch panel 180 --- arch/arm/mach-rk29/board-rk29-fih.c | 21 ++++++++++++--------- drivers/input/touchscreen/atmel_maxtouch.c | 2 +- drivers/video/backlight/fih_touchkey_led.c | 1 + 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/arch/arm/mach-rk29/board-rk29-fih.c b/arch/arm/mach-rk29/board-rk29-fih.c index 41360f1f172a..8b2572a62472 100755 --- a/arch/arm/mach-rk29/board-rk29-fih.c +++ b/arch/arm/mach-rk29/board-rk29-fih.c @@ -468,7 +468,8 @@ static struct mma8452_platform_data mma8452_info = { static struct mpu3050_platform_data mpu3050_data = { .int_config = 0x10, //.orientation = { 1, 0, 0,0, -1, 0,0, 0, 1 }, - .orientation = { 0, 1, 0,-1, 0, 0,0, 0, -1 }, + //.orientation = { 0, 1, 0,-1, 0, 0,0, 0, -1 }, + .orientation = { -1, 0, 0,0, -1, 0,0, 0, -1 }, .level_shifter = 0, #if defined (CONFIG_SENSORS_KXTF9) .accel = { @@ -479,7 +480,8 @@ static struct mpu3050_platform_data mpu3050_data = { .bus = EXT_SLAVE_BUS_SECONDARY, //The secondary I2C of MPU .address = 0x0f, //.orientation = { 1, 0, 0,0, 1, 0,0, 0, 1 }, - .orientation = { 0, -1, 0,-1, 0, 0,0, 0, -1 }, + //.orientation = { 0, -1, 0,-1, 0, 0,0, 0, -1 }, + .orientation = { 0, 1, 0,1, 0, 0,0, 0, -1 }, }, #endif #if defined (CONFIG_SENSORS_AK8975) @@ -492,7 +494,8 @@ static struct mpu3050_platform_data mpu3050_data = { .bus = EXT_SLAVE_BUS_PRIMARY, .address = 0x0d, //.orientation = { -1, 0, 0,0, -1, 0,0, 0, 1 }, - .orientation = { 0, -1, 0,-1, 0, 0,0, 0, -1 }, + //.orientation = { 0, -1, 0,-1, 0, 0,0, 0, -1 }, + .orientation = { 0, 1, 0,1, 0, 0,0, 0, -1 }, }, }; #endif @@ -942,7 +945,7 @@ struct rk29_i2c_platform_data default_i2c0_data = { .bus_num = 0, .flags = 0, .slave_addr = 0xff, - .scl_rate = 400*1000, + .scl_rate = 200*1000, .mode = I2C_MODE_IRQ, .io_init = rk29_i2c0_io_init, }; @@ -951,7 +954,7 @@ struct rk29_i2c_platform_data default_i2c1_data = { .bus_num = 1, .flags = 0, .slave_addr = 0xff, - .scl_rate = 400*1000, + .scl_rate = 200*1000, .mode = I2C_MODE_POLL, .io_init = rk29_i2c1_io_init, }; @@ -960,7 +963,7 @@ struct rk29_i2c_platform_data default_i2c2_data = { .bus_num = 2, .flags = 0, .slave_addr = 0xff, - .scl_rate = 400*1000, + .scl_rate = 200*1000, .mode = I2C_MODE_IRQ, .io_init = rk29_i2c2_io_init, }; @@ -969,7 +972,7 @@ struct rk29_i2c_platform_data default_i2c3_data = { .bus_num = 3, .flags = 0, .slave_addr = 0xff, - .scl_rate = 400*1000, + .scl_rate = 200*1000, .mode = I2C_MODE_POLL, .io_init = rk29_i2c3_io_init, }; @@ -1598,7 +1601,7 @@ struct rk29_bl_info rk29_bl_info = { #define FIH_TOUCHKEY_LED_PWM_MUX_MODE GPIO5H_PWM1 #define FIH_TOUCHKEY_LED_PWM_MUX_MODE_GPIO GPIO5H_GPIO5D2 #define FIH_TOUCHKEY_LED_PWM_GPIO RK29_PIN5_PD2 -#define FIH_TOUCHKEY_LED_PWM_EFFECT_VALUE 0 +#define FIH_TOUCHKEY_LED_PWM_EFFECT_VALUE 1 static int fih_touchkey_led_io_init(void) { @@ -1617,7 +1620,7 @@ static int fih_touchkey_led_pwm_suspend(void) printk("func %s, line %d: request gpio fail\n", __FUNCTION__, __LINE__); return -1; } - gpio_direction_output(FIH_TOUCHKEY_LED_PWM_GPIO, GPIO_HIGH); + gpio_direction_output(FIH_TOUCHKEY_LED_PWM_GPIO, GPIO_LOW); return ret; } diff --git a/drivers/input/touchscreen/atmel_maxtouch.c b/drivers/input/touchscreen/atmel_maxtouch.c index 799278d48524..f8a21e398f1a 100644 --- a/drivers/input/touchscreen/atmel_maxtouch.c +++ b/drivers/input/touchscreen/atmel_maxtouch.c @@ -180,7 +180,7 @@ u32 last_key=0; u8 T9_cfg[31] = { 0x83, 0x00, 0x00, 0x12, 0x0b, 0x00, 0x00, 0x1e, - 0x02, 0x00, 0x00, 0x03, 0x01, 0x0f, 0x02, 0x0a, + 0x02, 0x06, 0x00, 0x03, 0x01, 0x0f, 0x02, 0x0a, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, }; diff --git a/drivers/video/backlight/fih_touchkey_led.c b/drivers/video/backlight/fih_touchkey_led.c index 256ff06c9130..67255ad7544a 100644 --- a/drivers/video/backlight/fih_touchkey_led.c +++ b/drivers/video/backlight/fih_touchkey_led.c @@ -270,3 +270,4 @@ static int __init fih_touchkey_led_init(void) return 0; } fs_initcall_sync(fih_touchkey_led_init); +//late_initcall_sync(fih_touchkey_led_init); -- 2.34.1