diff options
| author | Linus Walleij | 2013-11-15 13:43:02 +0100 |
|---|---|---|
| committer | Linus Walleij | 2013-11-26 21:01:56 +0100 |
| commit | 1a780d45b10eb904be6a923fa09365255b5e733b (patch) | |
| tree | 15a4f457084bb861dfe013b266a517a68d236ce1 /arch/arm/mach-ux500 | |
| parent | ARM: ux500: move old HREF ipgpio to the device tree (diff) | |
| download | kernel-qcow2-linux-1a780d45b10eb904be6a923fa09365255b5e733b.tar.gz kernel-qcow2-linux-1a780d45b10eb904be6a923fa09365255b5e733b.tar.xz kernel-qcow2-linux-1a780d45b10eb904be6a923fa09365255b5e733b.zip | |
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.c | 8 |
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[] = { /* Accelerometer interrupt lines */ DB8500_PIN_HOG("GPIO82_C1", gpio_in_pu), /* ACC_INT1 */ DB8500_PIN_HOG("GPIO83_D3", gpio_in_pu), /* ACC_INT2 */ - /* - * Runtime stuff - * Pull up/down of some sensor GPIO pins, for proximity, HAL sensor - * etc. - */ - DB8500_PIN("GPIO217_AH12", gpio_in_pu_slpm_gpio_nopull, "gpio-keys.0"), - DB8500_PIN("GPIO145_C13", gpio_in_pd_slpm_gpio_nopull, "gpio-keys.0"), - DB8500_PIN("GPIO139_C9", gpio_in_pu_slpm_gpio_nopull, "gpio-keys.0"), }; static struct pinctrl_map __initdata u9500_pinmap[] = { |