MIPS: BCM47xx: Devices database update for 4.1 (or 4.2?)

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Cc: linux-mips@linux-mips.org
Cc: Hauke Mehrtens <hauke@hauke-m.de>
Patchwork: https://patchwork.linux-mips.org/patch/9656/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/bcm47xx/board.c b/arch/mips/bcm47xx/board.c
index f936dcc4f549d37f7652a46efb338cdcec8dce99..41b9736c3c054830376c27e77d112fea4ec2f8d3 100644 (file)
--- a/arch/mips/bcm47xx/board.c
+++ b/arch/mips/bcm47xx/board.c
@@ -151,9 +151,11 @@ static const
 struct bcm47xx_board_type_list1 bcm47xx_board_list_board_id[] __initconst = {
        {{BCM47XX_BOARD_NETGEAR_WGR614V8, "Netgear WGR614 V8"}, "U12H072T00_NETGEAR"},
        {{BCM47XX_BOARD_NETGEAR_WGR614V9, "Netgear WGR614 V9"}, "U12H094T00_NETGEAR"},
+       {{BCM47XX_BOARD_NETGEAR_WGR614_V10, "Netgear WGR614 V10"}, "U12H139T01_NETGEAR"},
        {{BCM47XX_BOARD_NETGEAR_WNDR3300, "Netgear WNDR3300"}, "U12H093T00_NETGEAR"},
        {{BCM47XX_BOARD_NETGEAR_WNDR3400V1, "Netgear WNDR3400 V1"}, "U12H155T00_NETGEAR"},
        {{BCM47XX_BOARD_NETGEAR_WNDR3400V2, "Netgear WNDR3400 V2"}, "U12H187T00_NETGEAR"},
+       {{BCM47XX_BOARD_NETGEAR_WNDR3400_V3, "Netgear WNDR3400 V3"}, "U12H208T00_NETGEAR"},
        {{BCM47XX_BOARD_NETGEAR_WNDR3400VCNA, "Netgear WNDR3400 Vcna"}, "U12H155T01_NETGEAR"},
        {{BCM47XX_BOARD_NETGEAR_WNDR3700V3, "Netgear WNDR3700 V3"}, "U12H194T00_NETGEAR"},
        {{BCM47XX_BOARD_NETGEAR_WNDR4000, "Netgear WNDR4000"}, "U12H181T00_NETGEAR"},
@@ -196,6 +198,8 @@ struct bcm47xx_board_type_list2 bcm47xx_board_list_board_type_rev[] __initconst
 static const
 struct bcm47xx_board_type_list2 bcm47xx_board_list_key_value[] __initconst = {
        {{BCM47XX_BOARD_ASUS_WL700GE, "Asus WL700"}, "model_no", "WL700"},
+       {{BCM47XX_BOARD_LINKSYS_WRT300N_V1, "Linksys WRT300N V1"}, "router_name", "WRT300N"},
+       {{BCM47XX_BOARD_LINKSYS_WRT600N_V11, "Linksys WRT600N V1.1"}, "Model_Name", "WRT600N"},
        {{BCM47XX_BOARD_LINKSYS_WRTSL54GS, "Linksys WRTSL54GS"}, "machine_name", "WRTSL54GS"},
        { {0}, NULL},
 };

diff --git a/arch/mips/bcm47xx/buttons.c b/arch/mips/bcm47xx/buttons.c
index 913182bcafb80a9341d7345955a21b79a6d045c1..276276a8c6d7dc939617dd287ee29cd65fa2be8b 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;

diff --git a/arch/mips/bcm47xx/leds.c b/arch/mips/bcm47xx/leds.c
index 903a656d4119f580f0a564fb39dd977befdda1ed..0e4ade3423332527fecf00d9d07e61c2ffccd45a 100644 (file)
--- a/arch/mips/bcm47xx/leds.c
+++ b/arch/mips/bcm47xx/leds.c
@@ -291,6 +291,13 @@ bcm47xx_leds_linksys_wrt160nv3[] __initconst = {
        BCM47XX_GPIO_LED(4, "blue", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
 };
 
+static const struct gpio_led
+bcm47xx_leds_linksys_wrt300n_v1[] __initconst = {
+       BCM47XX_GPIO_LED(1, "green", "power", 0, LEDS_GPIO_DEFSTATE_ON),
+       BCM47XX_GPIO_LED(3, "amber", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
+       BCM47XX_GPIO_LED(5, "green", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
+};
+
 static const struct gpio_led
 bcm47xx_leds_linksys_wrt300nv11[] __initconst = {
        BCM47XX_GPIO_LED(1, "unk", "power", 0, LEDS_GPIO_DEFSTATE_ON),
@@ -585,6 +592,9 @@ void __init bcm47xx_leds_register(void)
        case BCM47XX_BOARD_LINKSYS_WRT160NV3:
                bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt160nv3);
                break;
+       case BCM47XX_BOARD_LINKSYS_WRT300N_V1:
+               bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt300n_v1);
+               break;
        case BCM47XX_BOARD_LINKSYS_WRT300NV11:
                bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt300nv11);
                break;

diff --git a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h b/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
index 1f5643b89a91183f5f4f78ec7b48124f760a2062..c41d1dce1062ee4117ea7ed51326cefbc6d788aa 100644 (file)
--- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
+++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
@@ -67,6 +67,7 @@ enum bcm47xx_board {
        BCM47XX_BOARD_LINKSYS_WRT150NV11,
        BCM47XX_BOARD_LINKSYS_WRT160NV1,
        BCM47XX_BOARD_LINKSYS_WRT160NV3,
+       BCM47XX_BOARD_LINKSYS_WRT300N_V1,
        BCM47XX_BOARD_LINKSYS_WRT300NV11,
        BCM47XX_BOARD_LINKSYS_WRT310NV1,
        BCM47XX_BOARD_LINKSYS_WRT310NV2,
@@ -74,6 +75,7 @@ enum bcm47xx_board {
        BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0101,
        BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467,
        BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0708,
+       BCM47XX_BOARD_LINKSYS_WRT600N_V11,
        BCM47XX_BOARD_LINKSYS_WRT610NV1,
        BCM47XX_BOARD_LINKSYS_WRT610NV2,
        BCM47XX_BOARD_LINKSYS_WRTSL54GS,
@@ -86,9 +88,11 @@ enum bcm47xx_board {
 
        BCM47XX_BOARD_NETGEAR_WGR614V8,
        BCM47XX_BOARD_NETGEAR_WGR614V9,
+       BCM47XX_BOARD_NETGEAR_WGR614_V10,
        BCM47XX_BOARD_NETGEAR_WNDR3300,
        BCM47XX_BOARD_NETGEAR_WNDR3400V1,
        BCM47XX_BOARD_NETGEAR_WNDR3400V2,
+       BCM47XX_BOARD_NETGEAR_WNDR3400_V3,
        BCM47XX_BOARD_NETGEAR_WNDR3400VCNA,
        BCM47XX_BOARD_NETGEAR_WNDR3700V3,
        BCM47XX_BOARD_NETGEAR_WNDR4000,