diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-01 16:20:04 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-01 16:20:04 -0400 |
| commit | 251df49db3327c64bf917bfdba94491fde2b4ee0 (patch) | |
| tree | 71eef72e1c393057f7b14cc4d8da5e48c7728336 /arch/arm/mach-shmobile | |
| parent | 8a72f3820c4d14b27ad5336aed00063a7a7f1bef (diff) | |
| parent | bf61c8840efe60fd8f91446860b63338fb424158 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov:
"Assorted fixes and cleanups to the existing drivers plus a new driver
for IMS Passenger Control Unit device they use for ther in-flight
entertainment system."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (44 commits)
Input: trackpoint - Optimize trackpoint init to use power-on reset
Input: apbps2 - convert to devm_ioremap_resource()
Input: ALPS - use %ph to print buffers
ARM - shmobile: Armadillo800EVA: Move st1232 reset pin handling
Input: st1232 - add reset pin handling
Input: st1232 - convert to devm_* infrastructure
Input: MT - handle semi-mt devices in core
Input: adxl34x - use spi_get_drvdata()
Input: ad7877 - use spi_get_drvdata() and spi_set_drvdata()
Input: ads7846 - use spi_get_drvdata() and spi_set_drvdata()
Input: ims-pcu - fix a memory leak on error
Input: sysrq - supplement reset sequence with timeout functionality
Input: tegra-kbc - support for defining row/columns based on SoC
Input: imx_keypad - switch to using managed resources
Input: arc_ps2 - add support for device tree
Input: mma8450 - fix signed 12bits to 32bits conversion
Input: eeti_ts - remove redundant null check
Input: edt-ft5x06 - remove redundant null check before kfree
Input: ad714x - add CONFIG_PM_SLEEP to suspend/resume functions
Input: adxl34x - add CONFIG_PM_SLEEP to suspend/resume functions
...
Diffstat (limited to 'arch/arm/mach-shmobile')
| -rw-r--r-- | arch/arm/mach-shmobile/board-armadillo800eva.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c index ff8b7ba9b93c..881e5c0e41dd 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/err.h> | 24 | #include <linux/err.h> |
| 25 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
| 26 | #include <linux/input.h> | 26 | #include <linux/input.h> |
| 27 | #include <linux/platform_data/st1232_pdata.h> | ||
| 27 | #include <linux/irq.h> | 28 | #include <linux/irq.h> |
| 28 | #include <linux/platform_device.h> | 29 | #include <linux/platform_device.h> |
| 29 | #include <linux/gpio.h> | 30 | #include <linux/gpio.h> |
| @@ -882,10 +883,15 @@ static struct platform_device i2c_gpio_device = { | |||
| 882 | }; | 883 | }; |
| 883 | 884 | ||
| 884 | /* I2C */ | 885 | /* I2C */ |
| 886 | static struct st1232_pdata st1232_i2c0_pdata = { | ||
| 887 | .reset_gpio = 166, | ||
| 888 | }; | ||
| 889 | |||
| 885 | static struct i2c_board_info i2c0_devices[] = { | 890 | static struct i2c_board_info i2c0_devices[] = { |
| 886 | { | 891 | { |
| 887 | I2C_BOARD_INFO("st1232-ts", 0x55), | 892 | I2C_BOARD_INFO("st1232-ts", 0x55), |
| 888 | .irq = evt2irq(0x0340), | 893 | .irq = evt2irq(0x0340), |
| 894 | .platform_data = &st1232_i2c0_pdata, | ||
| 889 | }, | 895 | }, |
| 890 | { | 896 | { |
| 891 | I2C_BOARD_INFO("wm8978", 0x1a), | 897 | I2C_BOARD_INFO("wm8978", 0x1a), |
| @@ -1009,7 +1015,6 @@ static void __init eva_init(void) | |||
| 1009 | 1015 | ||
| 1010 | /* Touchscreen */ | 1016 | /* Touchscreen */ |
| 1011 | gpio_request(GPIO_FN_IRQ10, NULL); /* TP_INT */ | 1017 | gpio_request(GPIO_FN_IRQ10, NULL); /* TP_INT */ |
| 1012 | gpio_request_one(GPIO_PORT166, GPIOF_OUT_INIT_HIGH, NULL); /* TP_RST_B */ | ||
| 1013 | 1018 | ||
| 1014 | /* GETHER */ | 1019 | /* GETHER */ |
| 1015 | gpio_request(GPIO_FN_ET_CRS, NULL); | 1020 | gpio_request(GPIO_FN_ET_CRS, NULL); |