128 lines
4.7 KiB
Diff
128 lines
4.7 KiB
Diff
--- 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"},
|
|
--- 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),
|
|
@@ -414,6 +432,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;
|
|
@@ -544,6 +565,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;
|
|
--- 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,
|
|
--- 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;
|