diff options
| author | Mirko Parthey <mirko.parthey@web.de> | 2017-02-15 23:31:30 +0100 |
|---|---|---|
| committer | James Hogan <james.hogan@imgtec.com> | 2017-02-17 11:16:46 +0000 |
| commit | bdfdaf1a016ef09cb941f2edad485a713510b8d5 (patch) | |
| tree | b1e607c4351b7fcab5bc94b2aa38b40f63a83a7c /arch/mips | |
| parent | 650a2b29cd4aeff6e4d27d823c5f0dcea6566c8b (diff) | |
| download | linux-bdfdaf1a016ef09cb941f2edad485a713510b8d5.tar.bz2 | |
MIPS: BCM47XX: Fix button inversion for Asus WL-500W
The Asus WL-500W buttons are active high, but the software treats them
as active low. Fix the inverted logic.
Fixes: 3be972556fa1 ("MIPS: BCM47XX: Import buttons database from OpenWrt")
Signed-off-by: Mirko Parthey <mirko.parthey@web.de>
Acked-by: Rafał Miłecki <rafal@milecki.pl>
Cc: Hauke Mehrtens <hauke@hauke-m.de>
Cc: linux-mips@linux-mips.org
Cc: <stable@vger.kernel.org> # 3.14.x-
Patchwork: https://patchwork.linux-mips.org/patch/15295/
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/bcm47xx/buttons.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/mips/bcm47xx/buttons.c b/arch/mips/bcm47xx/buttons.c index 7d582275908c..8a760d801895 100644 --- a/arch/mips/bcm47xx/buttons.c +++ b/arch/mips/bcm47xx/buttons.c @@ -17,6 +17,12 @@ .active_low = 1, \ } +#define BCM47XX_GPIO_KEY_H(_gpio, _code) \ + { \ + .code = _code, \ + .gpio = _gpio, \ + } + /* Asus */ static const struct gpio_keys_button @@ -79,8 +85,8 @@ bcm47xx_buttons_asus_wl500gpv2[] __initconst = { static const struct gpio_keys_button bcm47xx_buttons_asus_wl500w[] __initconst = { - BCM47XX_GPIO_KEY(6, KEY_RESTART), - BCM47XX_GPIO_KEY(7, KEY_WPS_BUTTON), + BCM47XX_GPIO_KEY_H(6, KEY_RESTART), + BCM47XX_GPIO_KEY_H(7, KEY_WPS_BUTTON), }; static const struct gpio_keys_button |