diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-20 01:27:06 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-20 01:27:06 -0400 |
commit | a952baa034ae7c2e4a66932005cbc7ebbccfe28d (patch) | |
tree | ff5abe0c77f5b129946300677d9b57b00d926a1e /arch/arm | |
parent | 5bab188a316718a26346cdb25c4cc6b319f8f907 (diff) | |
parent | 97eb3f24352ec6632c2127b35d8087d2a809a9b9 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (64 commits)
Input: tsc2005 - remove 'disable' sysfs attribute
Input: tsc2005 - add open/close
Input: tsc2005 - handle read errors from SPI layer
Input: tsc2005 - do not rearm timer in hardirq handler
Input: tsc2005 - don't use work for 'pen up' handling
Input: tsc2005 - do not use 0 in place of NULL
Input: tsc2005 - use true/false for boolean variables
Input: tsc2005 - hide selftest attribute if we can't reset
Input: tsc2005 - rework driver initialization code
Input: tsc2005 - set up bus type in input device
Input: tsc2005 - set up parent device
Input: tsc2005 - clear driver data after unbinding
Input: tsc2005 - add module description
Input: tsc2005 - remove driver banner message
Input: tsc2005 - remove incorrect module alias
Input: tsc2005 - convert to using dev_pm_ops
Input: tsc2005 - use spi_get/set_drvdata()
Input: introduce tsc2005 driver
Input: xen-kbdfront - move to drivers/input/misc
Input: xen-kbdfront - add grant reference for shared page
...
Diffstat (limited to 'arch/arm')
-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 243291722c66..31d5aa769753 100644 --- a/arch/arm/mach-s5pv210/mach-goni.c +++ b/arch/arm/mach-s5pv210/mach-goni.c | |||
@@ -15,7 +15,7 @@ | |||
15 | #include <linux/fb.h> | 15 | #include <linux/fb.h> |
16 | #include <linux/i2c.h> | 16 | #include <linux/i2c.h> |
17 | #include <linux/i2c-gpio.h> | 17 | #include <linux/i2c-gpio.h> |
18 | #include <linux/i2c/qt602240_ts.h> | 18 | #include <linux/i2c/atmel_mxt_ts.h> |
19 | #include <linux/mfd/max8998.h> | 19 | #include <linux/mfd/max8998.h> |
20 | #include <linux/mfd/wm8994/pdata.h> | 20 | #include <linux/mfd/wm8994/pdata.h> |
21 | #include <linux/regulator/fixed.h> | 21 | #include <linux/regulator/fixed.h> |
@@ -25,6 +25,7 @@ | |||
25 | #include <linux/gpio_keys.h> | 25 | #include <linux/gpio_keys.h> |
26 | #include <linux/input.h> | 26 | #include <linux/input.h> |
27 | #include <linux/gpio.h> | 27 | #include <linux/gpio.h> |
28 | #include <linux/interrupt.h> | ||
28 | 29 | ||
29 | #include <asm/mach/arch.h> | 30 | #include <asm/mach/arch.h> |
30 | #include <asm/mach/map.h> | 31 | #include <asm/mach/map.h> |
@@ -225,7 +226,7 @@ static void __init goni_radio_init(void) | |||
225 | } | 226 | } |
226 | 227 | ||
227 | /* TSP */ | 228 | /* TSP */ |
228 | static struct qt602240_platform_data qt602240_platform_data = { | 229 | static struct mxt_platform_data qt602240_platform_data = { |
229 | .x_line = 17, | 230 | .x_line = 17, |
230 | .y_line = 11, | 231 | .y_line = 11, |
231 | .x_size = 800, | 232 | .x_size = 800, |
@@ -233,7 +234,8 @@ static struct qt602240_platform_data qt602240_platform_data = { | |||
233 | .blen = 0x21, | 234 | .blen = 0x21, |
234 | .threshold = 0x28, | 235 | .threshold = 0x28, |
235 | .voltage = 2800000, /* 2.8V */ | 236 | .voltage = 2800000, /* 2.8V */ |
236 | .orient = QT602240_DIAGONAL, | 237 | .orient = MXT_DIAGONAL, |
238 | .irqflags = IRQF_TRIGGER_FALLING, | ||
237 | }; | 239 | }; |
238 | 240 | ||
239 | static struct s3c2410_platform_i2c i2c2_data __initdata = { | 241 | static struct s3c2410_platform_i2c i2c2_data __initdata = { |