diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 14:07:26 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 14:07:26 +1100 |
| commit | 84f995ad01d8dd0d993396d2db23c47895cded2f (patch) | |
| tree | 2b79db2581651726a2c78e5cef7d94998e449149 /arch | |
| parent | 6dde5fd1a9a2e438c60efd89dff10ab856345fc2 (diff) | |
| parent | 0d3c07378bb7d423302d7cb0dcd3fa5a26c40220 (diff) | |
Merge remote-tracking branch 'input/next'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-s5pv210/mach-goni.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c index a431742884cd..a097683ae4e0 100644 --- a/arch/arm/mach-s5pv210/mach-goni.c +++ b/arch/arm/mach-s5pv210/mach-goni.c @@ -15,7 +15,7 @@ #include <linux/fb.h> #include <linux/i2c.h> #include <linux/i2c-gpio.h> -#include <linux/i2c/qt602240_ts.h> +#include <linux/i2c/atmel_mxt_ts.h> #include <linux/mfd/max8998.h> #include <linux/mfd/wm8994/pdata.h> #include <linux/regulator/fixed.h> @@ -25,6 +25,7 @@ #include <linux/gpio_keys.h> #include <linux/input.h> #include <linux/gpio.h> +#include <linux/interrupt.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> @@ -224,7 +225,7 @@ static void __init goni_radio_init(void) } /* TSP */ -static struct qt602240_platform_data qt602240_platform_data = { +static struct mxt_platform_data qt602240_platform_data = { .x_line = 17, .y_line = 11, .x_size = 800, @@ -232,7 +233,8 @@ static struct qt602240_platform_data qt602240_platform_data = { .blen = 0x21, .threshold = 0x28, .voltage = 2800000, /* 2.8V */ - .orient = QT602240_DIAGONAL, + .orient = MXT_DIAGONAL, + .irqflags = IRQF_TRIGGER_FALLING, }; static struct s3c2410_platform_i2c i2c2_data __initdata = { |