add it50 touch

diff --git a/arch/arm/configs/rk2818_info_defconfig b/arch/arm/configs/rk2818_info_defconfig
index 5483cb7218f0671df989cbc9a3cd00310a0defc9..f5fa5e57602189b6523a809e71e56c1811f93943 100755 (executable)
--- a/arch/arm/configs/rk2818_info_defconfig
+++ b/arch/arm/configs/rk2818_info_defconfig
@@ -890,7 +890,7 @@ CONFIG_GPIOLIB=y
 CONFIG_IOEXTEND_TCA6424=y
 CONFIG_EXPANDED_GPIO_NUM=24
 CONFIG_EXPANDED_GPIO_IRQ_NUM=24
-CONFIG_SOFT_INTERRUPT=y
+CONFIG_EXPAND_GPIO_SOFT_INTERRUPT=y
 CONFIG_SPI_FPGA_GPIO_NUM=0
 CONFIG_SPI_FPGA_GPIO_IRQ_NUM=0
 # CONFIG_W1 is not set
@@ -1913,4 +1913,4 @@ CONFIG_REED_SOLOMON_DEC8=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
-CONFIG_NLATTR=y
\ No newline at end of file
+CONFIG_NLATTR=y

diff --git a/arch/arm/configs/rk2818_info_it50_defconfig b/arch/arm/configs/rk2818_info_it50_defconfig
index d3c84c1d9fce69af50839435fc30bb62ddb15ab5..6be18d7e8884934b1a89cb8458d4cec25a20f8d8 100644 (file)
--- a/arch/arm/configs/rk2818_info_it50_defconfig
+++ b/arch/arm/configs/rk2818_info_it50_defconfig
@@ -863,7 +863,7 @@ CONFIG_GPIOLIB=y
 CONFIG_IOEXTEND_TCA6424=y
 CONFIG_EXPANDED_GPIO_NUM=24
 CONFIG_EXPANDED_GPIO_IRQ_NUM=24
-CONFIG_SOFT_INTERRUPT=y
+CONFIG_EXPAND_GPIO_SOFT_INTERRUPT=y
 CONFIG_SPI_FPGA_GPIO_NUM=0
 CONFIG_SPI_FPGA_GPIO_IRQ_NUM=0
 # CONFIG_W1 is not set

diff --git a/arch/arm/mach-rk2818/board-infoit50.c b/arch/arm/mach-rk2818/board-infoit50.c
index 20761408772a0eb6e531e389d68c4785fe86989a..6d02d50baccf602efd960ae2b228809ecdeee08d 100644 (file)
--- a/arch/arm/mach-rk2818/board-infoit50.c
+++ b/arch/arm/mach-rk2818/board-infoit50.c
@@ -913,7 +913,7 @@ struct rk2818_spi_platform_data rk2818_spi_platdata = {
 static struct xpt2046_platform_data xpt2046_info = {
        .model                  = 2046,
        .keep_vref_on   = 1,
-       .swap_xy                = 1,
+       .swap_xy                = 0,
        .x_min                  = 0,
        .x_max                  = 800,
        .y_min                  = 0,

diff --git a/drivers/input/touchscreen/xpt2046_ts.c b/drivers/input/touchscreen/xpt2046_ts.c
index de597bef2a42147ab264862f91ed51f9c6468239..d2a6d64c26844c77a2444b19bed812f8843c803b 100755 (executable)
--- a/drivers/input/touchscreen/xpt2046_ts.c
+++ b/drivers/input/touchscreen/xpt2046_ts.c
@@ -54,12 +54,22 @@
 #endif
 #define LCD_MAX_LENGTH                         800
 #define LCD_MAX_WIDTH                          480
+
+#ifdef CONFIG_MACH_RK2818INFO_IT50
+#define PT2046_TOUCH_AD_LEFT           4000
+#define PT2046_TOUCH_AD_RIGHT          110
+#define PT2046_TOUCH_AD_TOP            110
+#define PT2046_TOUCH_AD_BOTTOM 3800
+#define AD_TO_Y(adx)   (LCD_MAX_WIDTH * ( PT2046_TOUCH_AD_BOTTOM - adx) / ( PT2046_TOUCH_AD_BOTTOM  - PT2046_TOUCH_AD_TOP ))
+#define AD_TO_X(ady)   (LCD_MAX_LENGTH * (PT2046_TOUCH_AD_LEFT - ady) / (PT2046_TOUCH_AD_LEFT - PT2046_TOUCH_AD_RIGHT))
+#else
 #define PT2046_TOUCH_AD_LEFT           3855
 #define PT2046_TOUCH_AD_RIGHT          260
 #define PT2046_TOUCH_AD_TOP            300
 #define PT2046_TOUCH_AD_BOTTOM 3755
 #define AD_TO_X(adx)   (LCD_MAX_WIDTH * (adx - PT2046_TOUCH_AD_TOP) / ( PT2046_TOUCH_AD_BOTTOM  - PT2046_TOUCH_AD_TOP ))
 #define AD_TO_Y(ady)   (LCD_MAX_LENGTH * (PT2046_TOUCH_AD_LEFT - ady) / (PT2046_TOUCH_AD_LEFT - PT2046_TOUCH_AD_RIGHT))
+#endif
 
 #define TS_POLL_DELAY  (10 * 1000000)  /* ns delay before the first sample */
 #define TS_POLL_PERIOD (20 * 1000000)  /* ns delay between samples */