diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2016-09-13 14:47:58 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2020-10-12 21:55:58 +0100 |
| commit | 6664d56cfab39f9da97e1017bb02ee72ec706d3d (patch) | |
| tree | 45add0f051fe49275963dc85a30e6e2feefba2f5 | |
| parent | 99487e42f4da25bef11cb87efaacb0b5753151e5 (diff) | |
ARM: sa1100/simpad: correct GPIO for power button
Use the GPIO number rather than the interrupt number for the simpad
power button.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
| -rw-r--r-- | arch/arm/mach-sa1100/include/mach/simpad.h | 3 | ||||
| -rw-r--r-- | arch/arm/mach-sa1100/simpad.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-sa1100/include/mach/simpad.h b/arch/arm/mach-sa1100/include/mach/simpad.h index d53d680de3d9..43c0d3c36452 100644 --- a/arch/arm/mach-sa1100/include/mach/simpad.h +++ b/arch/arm/mach-sa1100/include/mach/simpad.h @@ -25,7 +25,7 @@ #define GPIO_UART3_DCD GPIO_GPIO18 #define GPIO_UART3_DSR GPIO_GPIO17 -#define GPIO_POWER_BUTTON GPIO_GPIO0 +#define GPIO_POWER_BUTTON 0 #define GPIO_UCB1300_IRQ GPIO_GPIO22 /* UCB GPIO and touchscreen */ #define IRQ_UART1_CTS IRQ_GPIO15 @@ -36,7 +36,6 @@ #define IRQ_UART3_DSR GPIO_GPIO17 #define IRQ_GPIO_UCB1300_IRQ IRQ_GPIO22 -#define IRQ_GPIO_POWER_BUTTON IRQ_GPIO0 /*--- PCMCIA ---*/ diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c index a7069d97e6f4..db46668cdad5 100644 --- a/arch/arm/mach-sa1100/simpad.c +++ b/arch/arm/mach-sa1100/simpad.c @@ -261,7 +261,7 @@ static void simpad_power_off(void) static struct gpio_keys_button simpad_button_table[] = { { .code = KEY_POWER, - .gpio = IRQ_GPIO_POWER_BUTTON, + .gpio = GPIO_POWER_BUTTON, .active_low = 1, .desc = "power button", }, |