From: Gabor Juhos Date: Wed, 21 Apr 2010 19:07:19 +0000 (+0000) Subject: ar71xx: use KEY_RESTART and KEY_WPS_BUTTON code for the appropriate buttons X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=906ab4c2ef9339efc97f6d099cc29182bbefade4 ar71xx: use KEY_RESTART and KEY_WPS_BUTTON code for the appropriate buttons SVN-Revision: 21075 --- diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c index 9aa17dce1a..acb9f5a1c2 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c @@ -119,14 +119,14 @@ static struct gpio_button ap83_gpio_buttons[] __initdata = { { .desc = "soft_reset", .type = EV_KEY, - .code = BTN_0, + .code = KEY_RESTART, .threshold = 3, .gpio = AP83_GPIO_BTN_RESET, .active_low = 1, } , { .desc = "jumpstart", .type = EV_KEY, - .code = BTN_1, + .code = KEY_WPS_BUTTON, .threshold = 3, .gpio = AP83_GPIO_BTN_JUMPSTART, .active_low = 1, diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-aw-nr580.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-aw-nr580.c index b9b037a7ca..a6c317ea60 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-aw-nr580.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-aw-nr580.c @@ -61,14 +61,14 @@ static struct gpio_button aw_nr580_gpio_buttons[] __initdata = { { .desc = "reset", .type = EV_KEY, - .code = BTN_0, + .code = KEY_RESTART, .threshold = 3, .gpio = AW_NR580_GPIO_BTN_RESET, .active_low = 1, }, { .desc = "wps", .type = EV_KEY, - .code = BTN_1, + .code = KEY_WPS_BUTTON, .threshold = 3, .gpio = AW_NR580_GPIO_BTN_WPS, .active_low = 1, diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-600-a1.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-600-a1.c index 7222405a08..d0a4490fc5 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-600-a1.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-600-a1.c @@ -96,14 +96,14 @@ static struct gpio_button dir_600_a1_gpio_buttons[] __initdata = { { .desc = "reset", .type = EV_KEY, - .code = BTN_0, + .code = KEY_RESTART, .threshold = 3, .gpio = DIR_600_A1_GPIO_BTN_RESET, .active_low = 1, }, { .desc = "wps", .type = EV_KEY, - .code = BTN_1, + .code = KEY_WPS_BUTTON, .threshold = 3, .gpio = DIR_600_A1_GPIO_BTN_WPS, .active_low = 1, diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-615-c1.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-615-c1.c index 8433b0cf14..9c302f79fc 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-615-c1.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-615-c1.c @@ -116,13 +116,13 @@ static struct gpio_button dir_615c1_gpio_buttons[] __initdata = { { .desc = "reset", .type = EV_KEY, - .code = BTN_0, + .code = KEY_RESTART, .threshold = 3, .gpio = DIR_615C1_GPIO_BTN_RESET, }, { .desc = "wps", .type = EV_KEY, - .code = BTN_1, + .code = KEY_WPS_BUTTON, .threshold = 3, .gpio = DIR_615C1_GPIO_BTN_WPS, } diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-825-b1.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-825-b1.c index d8b26eeb1a..f009bfb7ae 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-825-b1.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-825-b1.c @@ -116,7 +116,7 @@ static struct gpio_button dir825b1_gpio_buttons[] __initdata = { { .desc = "reset", .type = EV_KEY, - .code = BTN_0, + .code = KEY_RESTART, .threshold = 3, .gpio = DIR825B1_GPIO_BTN_RESET, .active_low = 1, diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c index bc8438f73f..b0dc0d19b2 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c @@ -105,14 +105,14 @@ static struct gpio_button mzk_w04nu_gpio_buttons[] __initdata = { { .desc = "reset", .type = EV_KEY, - .code = BTN_0, + .code = KEY_RESTART, .threshold = 3, .gpio = MZK_W04NU_GPIO_BTN_RESET, .active_low = 1, }, { .desc = "wps", .type = EV_KEY, - .code = BTN_1, + .code = KEY_WPS_BUTTON, .threshold = 3, .gpio = MZK_W04NU_GPIO_BTN_WPS, .active_low = 1, diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c index dfe7d0d6f9..6fb2312a23 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c @@ -104,14 +104,14 @@ static struct gpio_button mzk_w300nh_gpio_buttons[] __initdata = { { .desc = "reset", .type = EV_KEY, - .code = BTN_0, + .code = KEY_RESTART, .threshold = 3, .gpio = MZK_W300NH_GPIO_BTN_RESET, .active_low = 1, }, { .desc = "wps", .type = EV_KEY, - .code = BTN_1, + .code = KEY_WPS_BUTTON, .threshold = 3, .gpio = MZK_W300NH_GPIO_BTN_WPS, .active_low = 1, diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-nbg460n.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-nbg460n.c index 297f805d8b..fea08259ca 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-nbg460n.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-nbg460n.c @@ -111,14 +111,14 @@ static struct gpio_button nbg460n_gpio_buttons[] __initdata = { { .desc = "reset", .type = EV_KEY, - .code = BTN_0, + .code = KEY_RESTART, .threshold = 5, .gpio = NBG460N_GPIO_BTN_RESET, .active_low = 1, }, { .desc = "wps", .type = EV_KEY, - .code = BTN_1, + .code = KEY_WPS_BUTTON, .threshold = 5, .gpio = NBG460N_GPIO_BTN_WPS, .active_low = 1, diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb44.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb44.c index aa746665e3..e514635d16 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb44.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb44.c @@ -94,14 +94,14 @@ static struct gpio_button pb44_gpio_buttons[] __initdata = { { .desc = "soft_reset", .type = EV_KEY, - .code = BTN_0, + .code = KEY_RESTART, .threshold = 3, .gpio = PB44_GPIO_SW_RESET, .active_low = 1, } , { .desc = "jumpstart", .type = EV_KEY, - .code = BTN_1, + .code = KEY_WPS_BUTTON, .threshold = 3, .gpio = PB44_GPIO_SW_JUMP, .active_low = 1, diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb4xx.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb4xx.c index 57c06d8c0c..49089f59b2 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb4xx.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb4xx.c @@ -42,7 +42,7 @@ static struct gpio_button rb4xx_gpio_buttons[] __initdata = { { .desc = "reset_switch", .type = EV_KEY, - .code = BTN_0, + .code = KEY_RESTART, .threshold = 3, .gpio = RB4XX_GPIO_RESET_SWITCH, .active_low = 1, diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c index 787f83eb01..4581fa0b57 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c @@ -92,13 +92,13 @@ static struct gpio_button tew_632brp_gpio_buttons[] __initdata = { { .desc = "reset", .type = EV_KEY, - .code = BTN_0, + .code = KEY_RESTART, .threshold = 3, .gpio = TEW_632BRP_GPIO_BTN_RESET, }, { .desc = "wps", .type = EV_KEY, - .code = BTN_1, + .code = KEY_WPS_BUTTON, .threshold = 3, .gpio = TEW_632BRP_GPIO_BTN_WPS, } diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c index 3b7b764c22..b1e203859c 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c @@ -94,14 +94,14 @@ static struct gpio_button tl_wr1043nd_gpio_buttons[] __initdata = { { .desc = "reset", .type = EV_KEY, - .code = BTN_0, + .code = KEY_RESTART, .threshold = 3, .gpio = TL_WR1043ND_GPIO_BTN_RESET, .active_low = 1, }, { .desc = "qss", .type = EV_KEY, - .code = BTN_1, + .code = KEY_WPS_BUTTON, .threshold = 3, .gpio = TL_WR1043ND_GPIO_BTN_QSS, .active_low = 1, diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr741nd.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr741nd.c index 510dcf4127..93332228df 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr741nd.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr741nd.c @@ -80,14 +80,14 @@ static struct gpio_button tl_wr741nd_gpio_buttons[] __initdata = { { .desc = "reset", .type = EV_KEY, - .code = BTN_0, + .code = KEY_RESTART, .threshold = 3, .gpio = TL_WR741ND_GPIO_BTN_RESET, .active_low = 1, }, { .desc = "qss", .type = EV_KEY, - .code = BTN_1, + .code = KEY_WPS_BUTTON, .threshold = 3, .gpio = TL_WR741ND_GPIO_BTN_QSS, .active_low = 1, diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr841n.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr841n.c index 1b849e18b8..fd832d6d97 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr841n.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr841n.c @@ -83,14 +83,14 @@ static struct gpio_button tl_wr841n_v1_gpio_buttons[] __initdata = { { .desc = "reset", .type = EV_KEY, - .code = BTN_0, + .code = KEY_RESTART, .threshold = 3, .gpio = TL_WR841ND_V1_GPIO_BTN_RESET, .active_low = 1, }, { .desc = "qss", .type = EV_KEY, - .code = BTN_1, + .code = KEY_WPS_BUTTON, .threshold = 3, .gpio = TL_WR841ND_V1_GPIO_BTN_QSS, .active_low = 1, diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c index 0c648939f9..2471d48d2e 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c @@ -83,14 +83,14 @@ static struct gpio_button tl_wr941nd_gpio_buttons[] __initdata = { { .desc = "reset", .type = EV_KEY, - .code = BTN_0, + .code = KEY_RESTART, .threshold = 3, .gpio = TL_WR941ND_GPIO_BTN_RESET, .active_low = 1, }, { .desc = "qss", .type = EV_KEY, - .code = BTN_1, + .code = KEY_WPS_BUTTON, .threshold = 3, .gpio = TL_WR941ND_GPIO_BTN_QSS, .active_low = 1, diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c index 04a08dcf3e..d77d915bc7 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c @@ -104,7 +104,7 @@ static struct gpio_button ubnt_gpio_buttons[] __initdata = { { .desc = "sw4", .type = EV_KEY, - .code = BTN_0, + .code = KEY_RESTART, .threshold = 3, .gpio = UBNT_RS_GPIO_SW4, .active_low = 1, @@ -115,7 +115,7 @@ static struct gpio_button ubnt_m_gpio_buttons[] __initdata = { { .desc = "reset", .type = EV_KEY, - .code = BTN_0, + .code = KEY_RESTART, .threshold = 3, .gpio = UBNT_M_GPIO_BTN_RESET, .active_low = 1, diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c index 62931e6a11..51e2ce53fc 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c @@ -130,14 +130,14 @@ static struct gpio_button wndr3700_gpio_buttons[] __initdata = { { .desc = "reset", .type = EV_KEY, - .code = BTN_0, + .code = KEY_RESTART, .threshold = 3, .gpio = WNDR3700_GPIO_BTN_RESET, .active_low = 1, }, { .desc = "wps", .type = EV_KEY, - .code = BTN_1, + .code = KEY_WPS_BUTTON, .threshold = 3, .gpio = WNDR3700_GPIO_BTN_WPS, .active_low = 1, diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wnr2000.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wnr2000.c index 73422d6bad..b0c547065f 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wnr2000.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wnr2000.c @@ -102,13 +102,13 @@ static struct gpio_button wnr2000_gpio_buttons[] __initdata = { { .desc = "reset", .type = EV_KEY, - .code = BTN_0, + .code = KEY_RESTART, .threshold = 3, .gpio = WNR2000_GPIO_BTN_RESET, }, { .desc = "wps", .type = EV_KEY, - .code = BTN_1, + .code = KEY_WPS_BUTTON, .threshold = 3, .gpio = WNR2000_GPIO_BTN_WPS, } diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt160nl.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt160nl.c index 7fb97d979a..74d30573cf 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt160nl.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt160nl.c @@ -100,14 +100,14 @@ static struct gpio_button wrt160nl_gpio_buttons[] __initdata = { { .desc = "reset", .type = EV_KEY, - .code = BTN_0, + .code = KEY_RESTART, .threshold = 3, .gpio = WRT160NL_GPIO_BTN_RESET, .active_low = 1, }, { .desc = "wps", .type = EV_KEY, - .code = BTN_1, + .code = KEY_WPS_BUTTON, .threshold = 3, .gpio = WRT160NL_GPIO_BTN_WPS, .active_low = 1, diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt400n.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt400n.c index 5ed0b60583..d28193850e 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt400n.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt400n.c @@ -114,14 +114,14 @@ static struct gpio_button wrt400n_gpio_buttons[] __initdata = { { .desc = "reset", .type = EV_KEY, - .code = BTN_0, + .code = KEY_RESTART, .threshold = 3, .gpio = WRT400N_GPIO_BTN_RESET, .active_low = 1, } , { .desc = "wlsec", .type = EV_KEY, - .code = BTN_1, + .code = KEY_WPS_BUTTON, .threshold = 3, .gpio = WRT400N_GPIO_BTN_WLSEC, .active_low = 1, diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c index b52cc601fc..c12b0a0415 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c @@ -147,14 +147,14 @@ static struct gpio_button wzrhpg300nh_gpio_buttons[] __initdata = { { .desc = "reset", .type = EV_KEY, - .code = BTN_0, + .code = KEY_RESTART, .threshold = 3, .gpio = WZRHPG300NH_GPIO_BTN_RESET, .active_low = 1, }, { .desc = "aoss", .type = EV_KEY, - .code = BTN_1, + .code = KEY_WPS_BUTTON, .threshold = 3, .gpio = WZRHPG300NH_GPIO_BTN_AOSS, .active_low = 1,