[OpenWrt-Devel,LEDE-DEV] ar71xx: WNDR3700: enable RFKILL function for Wifi button

Message ID 20180222231108.24a63cb9@kosmio.komorska
State Accepted
Delegated to: John Crispin
Headers show
Series
  • [OpenWrt-Devel,LEDE-DEV] ar71xx: WNDR3700: enable RFKILL function for Wifi button
Related show

Commit Message

Michal Cieslakiewicz Feb. 22, 2018, 10:11 p.m.
Wifi button for WNDR3700 dual band routers has been renamed to "rfkill"
and its emitted keycode changed to KEY_RFKILL. This allows OpenWrt/LEDE
to support it 'out of the box' without additional tweaking.

Until this patch, button had been sending BTN_2 keycode which was
ignored by default (no action script present). To get expected behaviour
of switching radios on and off, user had to manually rename/link
'rfkill' script to name 'BTN_2' in /etc/rc.button directory.

This patch follows similar changes for other Netgear ar71xx routers,
for example WNR2000v3. It applies cleanly to both latest trunk and 17.01
branch. Tested on WNDR3700v1.

Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
---
 target/linux/ar71xx/files/arch/mips/ath79/mach-wndr3700.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Patch

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr3700.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr3700.c
index 1315bab037..b9132fc363 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr3700.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr3700.c
@@ -33,7 +33,7 @@ 
 
 #define WNDR3700_GPIO_BTN_WPS		3
 #define WNDR3700_GPIO_BTN_RESET		8
-#define WNDR3700_GPIO_BTN_WIFI		11
+#define WNDR3700_GPIO_BTN_RFKILL	11
 
 #define WNDR3700_GPIO_RTL8366_SDA	5
 #define WNDR3700_GPIO_RTL8366_SCK	7
@@ -89,11 +89,11 @@  static struct gpio_keys_button wndr3700_gpio_keys[] __initdata = {
 		.gpio		= WNDR3700_GPIO_BTN_WPS,
 		.active_low	= 1,
 	}, {
-		.desc		= "wifi",
+		.desc		= "rfkill",
 		.type		= EV_KEY,
-		.code		= BTN_2,
+		.code		= KEY_RFKILL,
 		.debounce_interval = WNDR3700_KEYS_DEBOUNCE_INTERVAL,
-		.gpio		= WNDR3700_GPIO_BTN_WIFI,
+		.gpio		= WNDR3700_GPIO_BTN_RFKILL,
 		.active_low	= 1,
 	}
 };