aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ux500
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-11-15 07:43:02 -0500
committerLinus Walleij <linus.walleij@linaro.org>2013-11-26 15:01:56 -0500
commit1a780d45b10eb904be6a923fa09365255b5e733b (patch)
tree15a4f457084bb861dfe013b266a517a68d236ce1 /arch/arm/mach-ux500
parent3ae2750a8c7112b83697dda5ef915886cb2a38cf (diff)
ARM: ux500: move GPIO key configuration to device tree
This moves over the configuration of the GPIO keys (used for proximity sensor and Hall effect sensor) from the static pin configuration file to the device tree. As part of the exercise, implement the GPIO keys properly in a per-UIB file as this setup actually differs with each UIB. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500')
-rw-r--r--arch/arm/mach-ux500/board-mop500-pins.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c
index 257c97a214a5..4535702a8e3f 100644
--- a/arch/arm/mach-ux500/board-mop500-pins.c
+++ b/arch/arm/mach-ux500/board-mop500-pins.c
@@ -382,14 +382,6 @@ static struct pinctrl_map __initdata hrefv60_pinmap[] = {
382 /* Accelerometer interrupt lines */ 382 /* Accelerometer interrupt lines */
383 DB8500_PIN_HOG("GPIO82_C1", gpio_in_pu), /* ACC_INT1 */ 383 DB8500_PIN_HOG("GPIO82_C1", gpio_in_pu), /* ACC_INT1 */
384 DB8500_PIN_HOG("GPIO83_D3", gpio_in_pu), /* ACC_INT2 */ 384 DB8500_PIN_HOG("GPIO83_D3", gpio_in_pu), /* ACC_INT2 */
385 /*
386 * Runtime stuff
387 * Pull up/down of some sensor GPIO pins, for proximity, HAL sensor
388 * etc.
389 */
390 DB8500_PIN("GPIO217_AH12", gpio_in_pu_slpm_gpio_nopull, "gpio-keys.0"),
391 DB8500_PIN("GPIO145_C13", gpio_in_pd_slpm_gpio_nopull, "gpio-keys.0"),
392 DB8500_PIN("GPIO139_C9", gpio_in_pu_slpm_gpio_nopull, "gpio-keys.0"),
393}; 385};
394 386
395static struct pinctrl_map __initdata u9500_pinmap[] = { 387static struct pinctrl_map __initdata u9500_pinmap[] = {