diff options
14 files changed, 21 insertions, 13 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); } diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c index caccc83cd12..db083a16284 100644 --- a/drivers/input/touchscreen/s3c2410_ts.c +++ b/drivers/input/touchscreen/s3c2410_ts.c @@ -72,7 +72,7 @@ #include <plat/regs-adc.h> #include <plat/adc.h> -#include "ts_filter_chain.h" +#include <linux/input/touchscreen/ts_filter_chain.h> /* For ts.dev.id.version */ #define S3C2410TSVERSION 0x0101 diff --git a/drivers/input/touchscreen/ts_filter_chain.c b/drivers/input/touchscreen/ts_filter_chain.c index 17793ace144..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 "ts_filter_chain.h" -#include "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? diff --git a/drivers/input/touchscreen/ts_filter_group.c b/drivers/input/touchscreen/ts_filter_group.c index 722e8dfbdae..9e344c5f19f 100644 --- a/drivers/input/touchscreen/ts_filter_group.c +++ b/drivers/input/touchscreen/ts_filter_group.c @@ -45,7 +45,7 @@ #include <linux/kernel.h> #include <linux/slab.h> -#include "ts_filter_group.h" +#include <linux/input/touchscreen/ts_filter_group.h> struct coord_range { int min; /* Minimum value of the range. */ diff --git a/drivers/input/touchscreen/ts_filter_linear.c b/drivers/input/touchscreen/ts_filter_linear.c index 7718bbc6e6d..8b496591eec 100644 --- a/drivers/input/touchscreen/ts_filter_linear.c +++ b/drivers/input/touchscreen/ts_filter_linear.c @@ -28,7 +28,7 @@ #include <linux/slab.h> #include <linux/string.h> -#include "ts_filter_linear.h" +#include <linux/input/touchscreen/ts_filter_linear.h> struct ts_filter_linear; diff --git a/drivers/input/touchscreen/ts_filter_mean.c b/drivers/input/touchscreen/ts_filter_mean.c index 0c604321713..ad4e9c1207c 100644 --- a/drivers/input/touchscreen/ts_filter_mean.c +++ b/drivers/input/touchscreen/ts_filter_mean.c @@ -25,7 +25,7 @@ #include <linux/kernel.h> #include <linux/slab.h> -#include "ts_filter_mean.h" +#include <linux/input/touchscreen/ts_filter_mean.h> struct ts_filter_mean { /* Copy of the private filter configuration. */ diff --git a/drivers/input/touchscreen/ts_filter_median.c b/drivers/input/touchscreen/ts_filter_median.c index 6f8aae5941d..c608f7a9794 100644 --- a/drivers/input/touchscreen/ts_filter_median.c +++ b/drivers/input/touchscreen/ts_filter_median.c @@ -32,7 +32,7 @@ #include <linux/errno.h> #include <linux/kernel.h> #include <linux/slab.h> -#include "ts_filter_median.h" +#include <linux/input/touchscreen/ts_filter_median.h> struct ts_filter_median { /* Private configuration. */ diff --git a/drivers/input/touchscreen/ts_filter.h b/include/linux/input/touchscreen/ts_filter.h index 632e5fb3f4e..632e5fb3f4e 100644 --- a/drivers/input/touchscreen/ts_filter.h +++ b/include/linux/input/touchscreen/ts_filter.h diff --git a/drivers/input/touchscreen/ts_filter_chain.h b/include/linux/input/touchscreen/ts_filter_chain.h index 065a6a026d2..a021ba25bd4 100644 --- a/drivers/input/touchscreen/ts_filter_chain.h +++ b/include/linux/input/touchscreen/ts_filter_chain.h @@ -7,7 +7,7 @@ * (c) 2008,2009 Andy Green <andy@warmcat.com> */ -#include "ts_filter.h" +#include <linux/input/touchscreen/ts_filter.h> #include <linux/err.h> diff --git a/drivers/input/touchscreen/ts_filter_group.h b/include/linux/input/touchscreen/ts_filter_group.h index d1e3590e936..2d727f30086 100644 --- a/drivers/input/touchscreen/ts_filter_group.h +++ b/include/linux/input/touchscreen/ts_filter_group.h @@ -1,7 +1,7 @@ #ifndef __TS_FILTER_GROUP_H__ #define __TS_FILTER_GROUP_H__ -#include "ts_filter.h" +#include <linux/input/touchscreen/ts_filter.h> /* * Touchscreen group filter. diff --git a/drivers/input/touchscreen/ts_filter_linear.h b/include/linux/input/touchscreen/ts_filter_linear.h index 82df3d25b50..6f5e8307456 100644 --- a/drivers/input/touchscreen/ts_filter_linear.h +++ b/include/linux/input/touchscreen/ts_filter_linear.h @@ -1,7 +1,7 @@ #ifndef __TS_FILTER_LINEAR_H__ #define __TS_FILTER_LINEAR_H__ -#include "ts_filter.h" +#include <linux/input/touchscreen/ts_filter.h> #include <linux/kobject.h> /* diff --git a/drivers/input/touchscreen/ts_filter_mean.h b/include/linux/input/touchscreen/ts_filter_mean.h index 80f9b215dff..d4870413987 100644 --- a/drivers/input/touchscreen/ts_filter_mean.h +++ b/include/linux/input/touchscreen/ts_filter_mean.h @@ -1,7 +1,7 @@ #ifndef __TS_FILTER_MEAN_H__ #define __TS_FILTER_MEAN_H__ -#include "ts_filter.h" +#include <linux/input/touchscreen/ts_filter.h> /* * Touchscreen filter. diff --git a/drivers/input/touchscreen/ts_filter_median.h b/include/linux/input/touchscreen/ts_filter_median.h index b13f361bb6a..08051619531 100644 --- a/drivers/input/touchscreen/ts_filter_median.h +++ b/include/linux/input/touchscreen/ts_filter_median.h @@ -1,7 +1,7 @@ #ifndef __TS_FILTER_MEDIAN_H__ #define __TS_FILTER_MEDIAN_H__ -#include "ts_filter.h" +#include <linux/input/touchscreen/ts_filter.h> /* * Touchscreen filter. |