diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2009-10-24 22:09:26 +0200 |
---|---|---|
committer | Lars-Peter Clausen <lars@metafoo.de> | 2009-10-24 22:09:26 +0200 |
commit | 21f85315656630a662927b9754549b30d7198777 (patch) | |
tree | 694e70e97c3e8fe2456c7dedca58e9629f244d22 /arch/arm | |
parent | 1a6ac25d8fe1a5f4fccb1a733acd7a78b8ebc07e (diff) | |
parent | 36a5e8676f2d19482cd4d9837c12d24c58882f8a (diff) |
Merge branch 's3c-touchscreen-2.6.31' into om-gta01-2.6.31
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/ts.h | 2 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/adc.c | 8 |
2 files changed, 9 insertions, 1 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 d3e53c6352d..9cff2320e11 100644 --- a/arch/arm/plat-s3c24xx/adc.c +++ b/arch/arm/plat-s3c24xx/adc.c @@ -72,10 +72,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); } |