123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223 |
- --- a/arch/mips/bcm47xx/board.c
- +++ b/arch/mips/bcm47xx/board.c
- @@ -140,6 +140,7 @@ struct bcm47xx_board_type_list2 bcm47xx_
- {{BCM47XX_BOARD_LINKSYS_WRT300NV11, "Linksys WRT300N V1.1"}, "WRT300N", "1.1"},
- {{BCM47XX_BOARD_LINKSYS_WRT310NV1, "Linksys WRT310N V1"}, "WRT310N", "1.0"},
- {{BCM47XX_BOARD_LINKSYS_WRT310NV2, "Linksys WRT310N V2"}, "WRT310N", "2.0"},
- + {{BCM47XX_BOARD_LINKSYS_WRT320N_V1, "Linksys WRT320N V1"}, "WRT320N", "1.0"},
- {{BCM47XX_BOARD_LINKSYS_WRT54G3GV2, "Linksys WRT54G3GV2-VF"}, "WRT54G3GV2-VF", "1.0"},
- {{BCM47XX_BOARD_LINKSYS_WRT610NV1, "Linksys WRT610N V1"}, "WRT610N", "1.0"},
- {{BCM47XX_BOARD_LINKSYS_WRT610NV2, "Linksys WRT610N V2"}, "WRT610N", "2.0"},
- @@ -150,9 +151,12 @@ struct bcm47xx_board_type_list2 bcm47xx_
- static const
- struct bcm47xx_board_type_list1 bcm47xx_board_list_board_id[] __initconst = {
- {{BCM47XX_BOARD_LUXUL_XWR_1750_V1, "Luxul XWR-1750 V1"}, "luxul_xwr1750_v1"},
- + {{BCM47XX_BOARD_NETGEAR_R6300_V1, "Netgear R6300 V1"}, "U12H218T00_NETGEAR"},
- {{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_WN2500RP_V1, "Netgear WN2500RP V1"}, "U12H197T00_NETGEAR"},
- + {{BCM47XX_BOARD_NETGEAR_WN2500RP_V2, "Netgear WN2500RP V2"}, "U12H294T00_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"},
- @@ -162,6 +166,7 @@ struct bcm47xx_board_type_list1 bcm47xx_
- {{BCM47XX_BOARD_NETGEAR_WNDR4000, "Netgear WNDR4000"}, "U12H181T00_NETGEAR"},
- {{BCM47XX_BOARD_NETGEAR_WNDR4500V1, "Netgear WNDR4500 V1"}, "U12H189T00_NETGEAR"},
- {{BCM47XX_BOARD_NETGEAR_WNDR4500V2, "Netgear WNDR4500 V2"}, "U12H224T00_NETGEAR"},
- + {{BCM47XX_BOARD_NETGEAR_WNR1000_V3, "Netgear WNR1000 V3"}, "U12H139T50_NETGEAR"},
- {{BCM47XX_BOARD_NETGEAR_WNR2000, "Netgear WNR2000"}, "U12H114T00_NETGEAR"},
- {{BCM47XX_BOARD_NETGEAR_WNR3500L, "Netgear WNR3500L"}, "U12H136T99_NETGEAR"},
- {{BCM47XX_BOARD_NETGEAR_WNR3500U, "Netgear WNR3500U"}, "U12H136T00_NETGEAR"},
- --- a/arch/mips/bcm47xx/buttons.c
- +++ b/arch/mips/bcm47xx/buttons.c
- @@ -20,6 +20,12 @@
- /* Asus */
-
- static const struct gpio_keys_button
- +bcm47xx_buttons_asus_rtn10u[] __initconst = {
- + BCM47XX_GPIO_KEY(20, KEY_WPS_BUTTON),
- + BCM47XX_GPIO_KEY(21, KEY_RESTART),
- +};
- +
- +static const struct gpio_keys_button
- bcm47xx_buttons_asus_rtn12[] __initconst = {
- BCM47XX_GPIO_KEY(0, KEY_WPS_BUTTON),
- BCM47XX_GPIO_KEY(1, KEY_RESTART),
- @@ -270,6 +276,18 @@ bcm47xx_buttons_linksys_wrt310nv1[] __in
- };
-
- static const struct gpio_keys_button
- +bcm47xx_buttons_linksys_wrt310n_v2[] __initconst = {
- + BCM47XX_GPIO_KEY(5, KEY_WPS_BUTTON),
- + BCM47XX_GPIO_KEY(6, KEY_RESTART),
- +};
- +
- +static const struct gpio_keys_button
- +bcm47xx_buttons_linksys_wrt320n_v1[] __initconst = {
- + BCM47XX_GPIO_KEY(5, KEY_WPS_BUTTON),
- + BCM47XX_GPIO_KEY(8, KEY_RESTART),
- +};
- +
- +static const struct gpio_keys_button
- bcm47xx_buttons_linksys_wrt54g3gv2[] __initconst = {
- BCM47XX_GPIO_KEY(5, KEY_WIMAX),
- BCM47XX_GPIO_KEY(6, KEY_RESTART),
- @@ -333,6 +351,17 @@ bcm47xx_buttons_motorola_wr850gv2v3[] __
- /* Netgear */
-
- static const struct gpio_keys_button
- +bcm47xx_buttons_netgear_r6300_v1[] __initconst = {
- + BCM47XX_GPIO_KEY(6, KEY_RESTART),
- +};
- +
- +static const struct gpio_keys_button
- +bcm47xx_buttons_netgear_wn2500rp_v1[] __initconst = {
- + BCM47XX_GPIO_KEY(12, KEY_RESTART),
- + BCM47XX_GPIO_KEY(31, KEY_WPS_BUTTON),
- +};
- +
- +static const struct gpio_keys_button
- bcm47xx_buttons_netgear_wndr3400v1[] __initconst = {
- BCM47XX_GPIO_KEY(4, KEY_RESTART),
- BCM47XX_GPIO_KEY(6, KEY_WPS_BUTTON),
- @@ -360,6 +389,11 @@ bcm47xx_buttons_netgear_wndr4500v1[] __i
- };
-
- static const struct gpio_keys_button
- +bcm47xx_buttons_netgear_wnr1000_v3[] __initconst = {
- + BCM47XX_GPIO_KEY(3, KEY_RESTART),
- +};
- +
- +static const struct gpio_keys_button
- bcm47xx_buttons_netgear_wnr3500lv1[] __initconst = {
- BCM47XX_GPIO_KEY(4, KEY_RESTART),
- BCM47XX_GPIO_KEY(6, KEY_WPS_BUTTON),
- @@ -413,6 +447,9 @@ int __init bcm47xx_buttons_register(void
- int err;
-
- switch (board) {
- + case BCM47XX_BOARD_ASUS_RTN10U:
- + err = bcm47xx_copy_bdata(bcm47xx_buttons_asus_rtn10u);
- + break;
- case BCM47XX_BOARD_ASUS_RTN12:
- err = bcm47xx_copy_bdata(bcm47xx_buttons_asus_rtn12);
- break;
- @@ -543,6 +580,12 @@ int __init bcm47xx_buttons_register(void
- case BCM47XX_BOARD_LINKSYS_WRT310NV1:
- err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310nv1);
- break;
- + case BCM47XX_BOARD_LINKSYS_WRT310NV2:
- + err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310n_v2);
- + break;
- + case BCM47XX_BOARD_LINKSYS_WRT320N_V1:
- + err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt320n_v1);
- + break;
- case BCM47XX_BOARD_LINKSYS_WRT54G3GV2:
- err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt54g3gv2);
- break;
- @@ -579,6 +622,12 @@ int __init bcm47xx_buttons_register(void
- err = bcm47xx_copy_bdata(bcm47xx_buttons_motorola_wr850gv2v3);
- break;
-
- + case BCM47XX_BOARD_NETGEAR_R6300_V1:
- + err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_r6300_v1);
- + break;
- + case BCM47XX_BOARD_NETGEAR_WN2500RP_V1:
- + err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wn2500rp_v1);
- + break;
- case BCM47XX_BOARD_NETGEAR_WNDR3400V1:
- err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wndr3400v1);
- break;
- @@ -591,6 +640,9 @@ int __init bcm47xx_buttons_register(void
- case BCM47XX_BOARD_NETGEAR_WNDR4500V1:
- err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wndr4500v1);
- break;
- + case BCM47XX_BOARD_NETGEAR_WNR1000_V3:
- + err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wnr1000_v3);
- + break;
- case BCM47XX_BOARD_NETGEAR_WNR3500L:
- err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wnr3500lv1);
- break;
- --- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
- +++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
- @@ -71,6 +71,7 @@ enum bcm47xx_board {
- BCM47XX_BOARD_LINKSYS_WRT300NV11,
- BCM47XX_BOARD_LINKSYS_WRT310NV1,
- BCM47XX_BOARD_LINKSYS_WRT310NV2,
- + BCM47XX_BOARD_LINKSYS_WRT320N_V1,
- BCM47XX_BOARD_LINKSYS_WRT54G3GV2,
- BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0101,
- BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467,
- @@ -88,9 +89,12 @@ enum bcm47xx_board {
- BCM47XX_BOARD_MOTOROLA_WR850GP,
- BCM47XX_BOARD_MOTOROLA_WR850GV2V3,
-
- + BCM47XX_BOARD_NETGEAR_R6300_V1,
- BCM47XX_BOARD_NETGEAR_WGR614V8,
- BCM47XX_BOARD_NETGEAR_WGR614V9,
- BCM47XX_BOARD_NETGEAR_WGR614_V10,
- + BCM47XX_BOARD_NETGEAR_WN2500RP_V1,
- + BCM47XX_BOARD_NETGEAR_WN2500RP_V2,
- BCM47XX_BOARD_NETGEAR_WNDR3300,
- BCM47XX_BOARD_NETGEAR_WNDR3400V1,
- BCM47XX_BOARD_NETGEAR_WNDR3400V2,
- @@ -100,6 +104,7 @@ enum bcm47xx_board {
- BCM47XX_BOARD_NETGEAR_WNDR4000,
- BCM47XX_BOARD_NETGEAR_WNDR4500V1,
- BCM47XX_BOARD_NETGEAR_WNDR4500V2,
- + BCM47XX_BOARD_NETGEAR_WNR1000_V3,
- BCM47XX_BOARD_NETGEAR_WNR2000,
- BCM47XX_BOARD_NETGEAR_WNR3500L,
- BCM47XX_BOARD_NETGEAR_WNR3500U,
- --- a/arch/mips/bcm47xx/leds.c
- +++ b/arch/mips/bcm47xx/leds.c
- @@ -29,6 +29,14 @@
- /* Asus */
-
- static const struct gpio_led
- +bcm47xx_leds_asus_rtn10u[] __initconst = {
- + BCM47XX_GPIO_LED(5, "green", "wlan", 0, LEDS_GPIO_DEFSTATE_OFF),
- + BCM47XX_GPIO_LED(6, "green", "power", 1, LEDS_GPIO_DEFSTATE_ON),
- + BCM47XX_GPIO_LED(7, "green", "wps", 0, LEDS_GPIO_DEFSTATE_OFF),
- + BCM47XX_GPIO_LED(8, "green", "usb", 0, LEDS_GPIO_DEFSTATE_OFF),
- +};
- +
- +static const struct gpio_led
- bcm47xx_leds_asus_rtn12[] __initconst = {
- BCM47XX_GPIO_LED(2, "unk", "power", 1, LEDS_GPIO_DEFSTATE_ON),
- BCM47XX_GPIO_LED(7, "unk", "wlan", 0, LEDS_GPIO_DEFSTATE_OFF),
- @@ -313,6 +321,13 @@ bcm47xx_leds_linksys_wrt310nv1[] __initc
- };
-
- static const struct gpio_led
- +bcm47xx_leds_linksys_wrt320n_v1[] __initconst = {
- + BCM47XX_GPIO_LED(1, "blue", "wlan", 1, LEDS_GPIO_DEFSTATE_OFF),
- + BCM47XX_GPIO_LED(2, "blue", "power", 0, LEDS_GPIO_DEFSTATE_ON),
- + BCM47XX_GPIO_LED(4, "amber", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
- +};
- +
- +static const struct gpio_led
- bcm47xx_leds_linksys_wrt54g_generic[] __initconst = {
- BCM47XX_GPIO_LED(0, "unk", "dmz", 1, LEDS_GPIO_DEFSTATE_OFF),
- BCM47XX_GPIO_LED(1, "unk", "power", 0, LEDS_GPIO_DEFSTATE_ON),
- @@ -478,6 +493,9 @@ void __init bcm47xx_leds_register(void)
- enum bcm47xx_board board = bcm47xx_board_get();
-
- switch (board) {
- + case BCM47XX_BOARD_ASUS_RTN10U:
- + bcm47xx_set_pdata(bcm47xx_leds_asus_rtn10u);
- + break;
- case BCM47XX_BOARD_ASUS_RTN12:
- bcm47xx_set_pdata(bcm47xx_leds_asus_rtn12);
- break;
- @@ -611,6 +629,9 @@ void __init bcm47xx_leds_register(void)
- case BCM47XX_BOARD_LINKSYS_WRT310NV1:
- bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt310nv1);
- break;
- + case BCM47XX_BOARD_LINKSYS_WRT320N_V1:
- + bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt320n_v1);
- + break;
- case BCM47XX_BOARD_LINKSYS_WRT54G3GV2:
- bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54g3gv2);
- break;
|