summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mvf
diff options
context:
space:
mode:
authorRussell Robinson Jr <rrobinson@phytec.com>2012-12-17 11:38:33 -0800
committerRussell Robinson Jr <rrobinson@phytec.com>2012-12-19 15:22:47 -0800
commit15f55e0b22f8953b56fb5d6bdf8b770228f2f449 (patch)
treea7ac5cc13b1827d0be55f189947597a4fa3570fd /arch/arm/mach-mvf
parent2d2f46802d5da6cee95d00ac8d3650aa55534a91 (diff)
pcm052: enable EEPROM driver in config, fix TSC IRQsPD13.0.0alpha3.0-pcm052-ts1
Signed-off-by: Russell Robinson Jr <rrobinson@phytec.com>
Diffstat (limited to 'arch/arm/mach-mvf')
-rw-r--r--arch/arm/mach-mvf/board-pcm052.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mvf/board-pcm052.c b/arch/arm/mach-mvf/board-pcm052.c
index dc583b4a69f5..08b071f1dcf7 100644
--- a/arch/arm/mach-mvf/board-pcm052.c
+++ b/arch/arm/mach-mvf/board-pcm052.c
@@ -436,7 +436,7 @@ static struct stmpe_ts_platform_data pba_ts_stm_pdata = {
static struct stmpe_platform_data pba_stm_pdata = {
.blocks = STMPE_BLOCK_GPIO | STMPE_BLOCK_TOUCHSCREEN,
- .irq_base = NR_IRQS,
+ .irq_base = STMPE_IRQ_BASE,
.irq_trigger = IRQF_TRIGGER_RISING,
.irq_invert_polarity = true,
.gpio = &pba_gpio_stm_data,
@@ -457,7 +457,7 @@ static struct i2c_board_info pcm052_i2c2_board_info[] __initdata = {
},
{
I2C_BOARD_INFO("stmpe811", 0x41),
- .irq = PCM052_TS_IRQ,
+ .irq = gpio_to_irq(PCM052_TS_IRQ),
.platform_data = &pba_stm_pdata,
},
};