ar71xx: use KEY_RESTART and KEY_WPS_BUTTON code for the appropriate buttons
authorGabor Juhos <juhosg@openwrt.org>
Wed, 21 Apr 2010 19:07:19 +0000 (19:07 +0000)
committerGabor Juhos <juhosg@openwrt.org>
Wed, 21 Apr 2010 19:07:19 +0000 (19:07 +0000)
SVN-Revision: 21075

21 files changed:
target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c
target/linux/ar71xx/files/arch/mips/ar71xx/mach-aw-nr580.c
target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-600-a1.c
target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-615-c1.c
target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-825-b1.c
target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c
target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c
target/linux/ar71xx/files/arch/mips/ar71xx/mach-nbg460n.c
target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb44.c
target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb4xx.c
target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c
target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c
target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr741nd.c
target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr841n.c
target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c
target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c
target/linux/ar71xx/files/arch/mips/ar71xx/mach-wnr2000.c
target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt160nl.c
target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt400n.c
target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c

index 9aa17dc..acb9f5a 100644 (file)
@@ -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,
index b9b037a..a6c317e 100644 (file)
@@ -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,
index 7222405..d0a4490 100644 (file)
@@ -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,
index 8433b0c..9c302f7 100644 (file)
@@ -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,
        }
index d8b26ee..f009bfb 100644 (file)
@@ -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,
index bc8438f..b0dc0d1 100644 (file)
@@ -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,
index dfe7d0d..6fb2312 100644 (file)
@@ -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,
index 297f805..fea0825 100644 (file)
@@ -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,
index aa74666..e514635 100644 (file)
@@ -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,
index 57c06d8..49089f5 100644 (file)
@@ -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,
index 787f83e..4581fa0 100644 (file)
@@ -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,
        }
index 3b7b764..b1e2038 100644 (file)
@@ -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,
index 510dcf4..9333222 100644 (file)
@@ -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,
index 1b849e1..fd832d6 100644 (file)
@@ -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,
index 0c64893..2471d48 100644 (file)
@@ -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,
index 04a08dc..d77d915 100644 (file)
@@ -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,
index 62931e6..51e2ce5 100644 (file)
@@ -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,
index 73422d6..b0c5470 100644 (file)
@@ -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,
        }
index 7fb97d9..74d3057 100644 (file)
@@ -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,
index 5ed0b60..d281938 100644 (file)
@@ -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,
index b52cc60..c12b0a0 100644 (file)
@@ -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,