aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c2440
diff options
context:
space:
mode:
authorSven Rebhan <OdinsHorse@googlemail.com>2009-01-28 18:24:37 +0000
committerAndy Green <agreen@octopus.localdomain>2009-01-28 18:24:37 +0000
commit1537f2fae4eb0ca0c3d516dfe121f5eda71e0c2c (patch)
tree658a8c0dfccdf623964878b3724e93f525494a2b /arch/arm/mach-s3c2440
parent43954efa52562dea2fdcdcc6af75663c6b0e2c27 (diff)
Take care of switched off filters
If filtering is switched off, we need to avoid using filter functions in the GTA02 platform file. Therefore we wrap the usage with #ifdefs and define an empty filter chain. Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
Diffstat (limited to 'arch/arm/mach-s3c2440')
-rw-r--r--arch/arm/mach-s3c2440/mach-gta02.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
index 26f1f2d039c..29d35f2e3a7 100644
--- a/arch/arm/mach-s3c2440/mach-gta02.c
+++ b/arch/arm/mach-s3c2440/mach-gta02.c
@@ -103,10 +103,12 @@
#include "../plat-s3c24xx/neo1973_pm_gps.h"
+#ifdef CONFIG_TOUCHSCREEN_FILTER
#include <../drivers/input/touchscreen/ts_filter_linear.h>
#include <../drivers/input/touchscreen/ts_filter_mean.h>
#include <../drivers/input/touchscreen/ts_filter_median.h>
#include <../drivers/input/touchscreen/ts_filter_group.h>
+#endif
/* arbitrates which sensor IRQ owns the shared SPI bus */
static spinlock_t motion_irq_lock;
@@ -1015,7 +1017,7 @@ static struct s3c2410_udc_mach_info gta02_udc_cfg = {
/* touchscreen configuration */
-
+#ifdef CONFIG_TOUCHSCREEN_FILTER
static struct ts_filter_linear_configuration gta02_ts_linear_config = {
.constants = {1, 0, 0, 0, 1, 0, 1}, /* don't modify coords */
.coord0 = 0,
@@ -1056,7 +1058,14 @@ static struct s3c2410_ts_mach_info gta02_ts_cfg = {
[3] = &gta02_ts_linear_config,
},
};
-
+#else /* !CONFIG_TOUCHSCREEN_FILTER */
+static struct s3c2410_ts_mach_info gta02_ts_cfg = {
+ .delay = 10000,
+ .presc = 0xff, /* slow as we can go */
+ .filter_sequence = { NULL },
+ .filter_config = { NULL },
+};
+#endif
static void gta02_bl_set_intensity(int intensity)
{