diff options
author | Sundar Iyer <sundar.iyer@stericsson.com> | 2010-12-03 16:05:38 +0100 |
---|---|---|
committer | Linus Walleij <linus.walleij@stericsson.com> | 2010-12-19 20:54:55 +0100 |
commit | 556fb03869ad4d14e5336093a7a8565456a26c21 (patch) | |
tree | c101cd16bcf442a82d2b5246b0c5409cd1b55313 /arch/arm/mach-ux500/board-mop500.c | |
parent | mach-ux500: move keymaps to new file (diff) | |
download | linux-556fb03869ad4d14e5336093a7a8565456a26c21.tar.xz linux-556fb03869ad4d14e5336093a7a8565456a26c21.zip |
mach-ux500: add STMPE1601 platform data
Signed-off-by: Sundar Iyer <sundar.iyer@stericsson.com>
[Minor fixups to GPIO enumerators]
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Diffstat (limited to 'arch/arm/mach-ux500/board-mop500.c')
-rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 0bc0aa311de1..a1c9ea1a66df 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -71,7 +71,11 @@ static pin_cfg_t mop500_pins[] = { GPIO167_KP_O1, GPIO168_KP_O0, - GPIO217_GPIO, /* GPIO_EXP_INT */ + /* GPIO_EXP_INT */ + GPIO217_GPIO, + + /* STMPE1601 IRQ */ + GPIO218_GPIO | PIN_INPUT_PULLUP, }; static struct ab8500_platform_data ab8500_platdata = { |