Merge tag 'pm+acpi-4.1-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[cascardo/linux.git] / arch / mips / bcm47xx / buttons.c

diff --git a/arch/mips/bcm47xx/buttons.c b/arch/mips/bcm47xx/buttons.c
index 913182b..276276a 100644 (file)
--- a/arch/mips/bcm47xx/buttons.c
+++ b/arch/mips/bcm47xx/buttons.c
@@ -251,6 +251,12 @@ bcm47xx_buttons_linksys_wrt160nv3[] __initconst = {
        BCM47XX_GPIO_KEY(6, KEY_RESTART),
 };
 
+static const struct gpio_keys_button
+bcm47xx_buttons_linksys_wrt300n_v1[] __initconst = {
+       BCM47XX_GPIO_KEY(4, KEY_WPS_BUTTON),
+       BCM47XX_GPIO_KEY(6, KEY_RESTART),
+};
+
 static const struct gpio_keys_button
 bcm47xx_buttons_linksys_wrt300nv11[] __initconst = {
        BCM47XX_GPIO_KEY(4, KEY_UNKNOWN),
@@ -326,6 +332,12 @@ bcm47xx_buttons_netgear_wndr3400v1[] __initconst = {
        BCM47XX_GPIO_KEY(8, KEY_RFKILL),
 };
 
+static const struct gpio_keys_button
+bcm47xx_buttons_netgear_wndr3400_v3[] __initconst = {
+       BCM47XX_GPIO_KEY(12, KEY_RESTART),
+       BCM47XX_GPIO_KEY(23, KEY_WPS_BUTTON),
+};
+
 static const struct gpio_keys_button
 bcm47xx_buttons_netgear_wndr3700v3[] __initconst = {
        BCM47XX_GPIO_KEY(2, KEY_RFKILL),
@@ -516,6 +528,9 @@ int __init bcm47xx_buttons_register(void)
        case BCM47XX_BOARD_LINKSYS_WRT160NV3:
                err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt160nv3);
                break;
+       case BCM47XX_BOARD_LINKSYS_WRT300N_V1:
+               err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt300n_v1);
+               break;
        case BCM47XX_BOARD_LINKSYS_WRT300NV11:
                err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt300nv11);
                break;
@@ -557,6 +572,9 @@ int __init bcm47xx_buttons_register(void)
        case BCM47XX_BOARD_NETGEAR_WNDR3400V1:
                err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wndr3400v1);
                break;
+       case BCM47XX_BOARD_NETGEAR_WNDR3400_V3:
+               err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wndr3400_v3);
+               break;
        case BCM47XX_BOARD_NETGEAR_WNDR3700V3:
                err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wndr3700v3);
                break;