diff options
| -rw-r--r-- | arch/arm/mach-s3c2410/include/mach/ts.h | 2 | ||||
| -rw-r--r-- | arch/arm/plat-s3c24xx/adc.c | 8 | ||||
| -rw-r--r-- | drivers/input/touchscreen/ts_filter_chain.c | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/ts.h b/arch/arm/mach-s3c2410/include/mach/ts.h index ffd73d5bda2..ac0c727d155 100644 --- a/arch/arm/mach-s3c2410/include/mach/ts.h +++ b/arch/arm/mach-s3c2410/include/mach/ts.h @@ -16,7 +16,7 @@ #ifndef __ASM_ARM_TS_H #define __ASM_ARM_TS_H -#include <../drivers/input/touchscreen/ts_filter.h> +#include <linux/input/touchscreen/ts_filter.h> struct s3c2410_ts_mach_info { /* Touchscreen delay. */ diff --git a/arch/arm/plat-s3c24xx/adc.c b/arch/arm/plat-s3c24xx/adc.c index 3b16670b003..8c443153d05 100644 --- a/arch/arm/plat-s3c24xx/adc.c +++ b/arch/arm/plat-s3c24xx/adc.c @@ -76,10 +76,18 @@ static LIST_HEAD(adc_pending); #define adc_dbg(_adc, msg...) dev_dbg(&(_adc)->pdev->dev, msg) +#define AUTOPST (S3C2410_ADCTSC_YM_SEN | S3C2410_ADCTSC_YP_SEN | \ + S3C2410_ADCTSC_XP_SEN | S3C2410_ADCTSC_AUTO_PST | \ + S3C2410_ADCTSC_XY_PST(0)) + static inline void s3c_adc_convert(struct adc_device *adc) { unsigned con = readl(adc->regs + S3C2410_ADCCON); + if (adc->cur->is_ts) + writel(S3C2410_ADCTSC_PULL_UP_DISABLE | AUTOPST, + adc->regs + S3C2410_ADCTSC); + con |= S3C2410_ADCCON_ENABLE_START; writel(con, adc->regs + S3C2410_ADCCON); } diff --git a/drivers/input/touchscreen/ts_filter_chain.c b/drivers/input/touchscreen/ts_filter_chain.c index 054ffc16d35..8b5e2145b27 100644 --- a/drivers/input/touchscreen/ts_filter_chain.c +++ b/drivers/input/touchscreen/ts_filter_chain.c @@ -19,8 +19,8 @@ #include <linux/kernel.h> #include <linux/device.h> -#include <linux/input/trouchscreen/ts_filter_chain.h> -#include <linux/input/trouchscreen/ts_filter.h> +#include <linux/input/touchscreen/ts_filter_chain.h> +#include <linux/input/touchscreen/ts_filter.h> /* * Tux, would you like the following function in /lib? |