725afa8613f5777da782ebcaf80c737ca0a3ded0
[openwrt.git] / target / linux / brcm47xx / patches-3.18 / 320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch
1 --- a/arch/mips/bcm47xx/board.c
2 +++ b/arch/mips/bcm47xx/board.c
3 @@ -140,6 +140,7 @@ struct bcm47xx_board_type_list2 bcm47xx_
4         {{BCM47XX_BOARD_LINKSYS_WRT300NV11, "Linksys WRT300N V1.1"}, "WRT300N", "1.1"},
5         {{BCM47XX_BOARD_LINKSYS_WRT310NV1, "Linksys WRT310N V1"}, "WRT310N", "1.0"},
6         {{BCM47XX_BOARD_LINKSYS_WRT310NV2, "Linksys WRT310N V2"}, "WRT310N", "2.0"},
7 +       {{BCM47XX_BOARD_LINKSYS_WRT320N_V1, "Linksys WRT320N V1"}, "WRT320N", "1.0"},
8         {{BCM47XX_BOARD_LINKSYS_WRT54G3GV2, "Linksys WRT54G3GV2-VF"}, "WRT54G3GV2-VF", "1.0"},
9         {{BCM47XX_BOARD_LINKSYS_WRT610NV1, "Linksys WRT610N V1"}, "WRT610N", "1.0"},
10         {{BCM47XX_BOARD_LINKSYS_WRT610NV2, "Linksys WRT610N V2"}, "WRT610N", "2.0"},
11 --- a/arch/mips/bcm47xx/buttons.c
12 +++ b/arch/mips/bcm47xx/buttons.c
13 @@ -270,6 +270,12 @@ bcm47xx_buttons_linksys_wrt310nv1[] __in
14  };
15  
16  static const struct gpio_keys_button
17 +bcm47xx_buttons_linksys_wrt320n_v1[] __initconst = {
18 +       BCM47XX_GPIO_KEY(5, KEY_WPS_BUTTON),
19 +       BCM47XX_GPIO_KEY(8, KEY_RESTART),
20 +};
21 +
22 +static const struct gpio_keys_button
23  bcm47xx_buttons_linksys_wrt54g3gv2[] __initconst = {
24         BCM47XX_GPIO_KEY(5, KEY_WIMAX),
25         BCM47XX_GPIO_KEY(6, KEY_RESTART),
26 @@ -537,6 +543,9 @@ int __init bcm47xx_buttons_register(void
27         case BCM47XX_BOARD_LINKSYS_WRT310NV1:
28                 err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310nv1);
29                 break;
30 +       case BCM47XX_BOARD_LINKSYS_WRT320N_V1:
31 +               err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt320n_v1);
32 +               break;
33         case BCM47XX_BOARD_LINKSYS_WRT54G3GV2:
34                 err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt54g3gv2);
35                 break;
36 --- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
37 +++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
38 @@ -71,6 +71,7 @@ enum bcm47xx_board {
39         BCM47XX_BOARD_LINKSYS_WRT300NV11,
40         BCM47XX_BOARD_LINKSYS_WRT310NV1,
41         BCM47XX_BOARD_LINKSYS_WRT310NV2,
42 +       BCM47XX_BOARD_LINKSYS_WRT320N_V1,
43         BCM47XX_BOARD_LINKSYS_WRT54G3GV2,
44         BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0101,
45         BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467,
46 --- a/arch/mips/bcm47xx/leds.c
47 +++ b/arch/mips/bcm47xx/leds.c
48 @@ -313,6 +313,13 @@ bcm47xx_leds_linksys_wrt310nv1[] __initc
49  };
50  
51  static const struct gpio_led
52 +bcm47xx_leds_linksys_wrt320n_v1[] __initconst = {
53 +       BCM47XX_GPIO_LED(1, "blue", "wlan", 1, LEDS_GPIO_DEFSTATE_OFF),
54 +       BCM47XX_GPIO_LED(2, "blue", "power", 0, LEDS_GPIO_DEFSTATE_ON),
55 +       BCM47XX_GPIO_LED(4, "amber", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
56 +};
57 +
58 +static const struct gpio_led
59  bcm47xx_leds_linksys_wrt54g_generic[] __initconst = {
60         BCM47XX_GPIO_LED(0, "unk", "dmz", 1, LEDS_GPIO_DEFSTATE_OFF),
61         BCM47XX_GPIO_LED(1, "unk", "power", 0, LEDS_GPIO_DEFSTATE_ON),
62 @@ -601,6 +608,9 @@ void __init bcm47xx_leds_register(void)
63         case BCM47XX_BOARD_LINKSYS_WRT310NV1:
64                 bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt310nv1);
65                 break;
66 +       case BCM47XX_BOARD_LINKSYS_WRT320N_V1:
67 +               bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt320n_v1);
68 +               break;
69         case BCM47XX_BOARD_LINKSYS_WRT54G3GV2:
70                 bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54g3gv2);
71                 break;