auto TS Calibration: auto switch support between info_sdk and it50

diff --git a/arch/arm/configs/rk2818_info_it50_defconfig b/arch/arm/configs/rk2818_info_it50_defconfig
index c89f6f282c3f103b41c511780d2a48e57a739c3e..24c323729db80ecd0261a36d065cd08532ea8b49 100644 (file)
--- a/arch/arm/configs/rk2818_info_it50_defconfig
+++ b/arch/arm/configs/rk2818_info_it50_defconfig
@@ -699,8 +699,8 @@ CONFIG_KEYBOARD_RK28ADC_IT50=y
 CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_ADS7846 is not set
 # CONFIG_TOUCHSCREEN_AD7877 is not set
-CONFIG_TOUCHSCREEN_XPT2046_SPI=y
-# CONFIG_TOUCHSCREEN_XPT2046_CBN_SPI is not set
+# CONFIG_TOUCHSCREEN_XPT2046_SPI is not set
+CONFIG_TOUCHSCREEN_XPT2046_CBN_SPI=y
 # CONFIG_TOUCHSCREEN_XPT2046_320X480_SPI is not set
 # CONFIG_TOUCHSCREEN_XPT2046_320X480_CBN_SPI is not set
 # CONFIG_TOUCHSCREEN_IT7250 is not set

diff --git a/drivers/input/touchscreen/calib_iface_ts.c b/drivers/input/touchscreen/calib_iface_ts.c
index b8d1d2ae3bc2cb119576d9bc138fe5dc230a64b1..14b9c5332c57d987287a5d078dd9d2d53b1890ed 100644 (file)
--- a/drivers/input/touchscreen/calib_iface_ts.c
+++ b/drivers/input/touchscreen/calib_iface_ts.c
@@ -45,8 +45,15 @@ int screen_y[5] = { 40,  40, 440, 440, 240};
 int uncali_x[5] = { 0 };\r
 int uncali_y[5] = { 0 };\r
 \r
+#ifdef CONFIG_MACH_RK2818INFO_IT50\r
 int uncali_x_default[5] = { 3735,  301, 3754,  290, 1993 };\r
 int uncali_y_default[5] = {  3442,  3497, 413, 459, 1880 };\r
+#endif\r
+\r
+#ifdef CONFIG_MACH_RK2818INFO \r
+int uncali_x_default[5] = { 438,  565, 3507,  3631, 2105 };\r
+int uncali_y_default[5] = {  3756,  489, 3792, 534, 2159 };\r
+#endif\r
 \r
 static ssize_t touch_mode_show(struct class *cls, char *_buf)\r
 {\r