brcm47xx: move OpenWrt arch patches a bit further

[openwrt/openwrt.git] / target / linux / brcm47xx / patches-3.10 / 127-MIPS-BCM47XX-add-button-and-led-configuration-for-so.patch

diff --git a/target/linux/brcm47xx/patches-3.10/127-MIPS-BCM47XX-add-button-and-led-configuration-for-so.patch b/target/linux/brcm47xx/patches-3.10/127-MIPS-BCM47XX-add-button-and-led-configuration-for-so.patch
deleted file mode 100644 (file)
index 845d071..0000000
--- a/target/linux/brcm47xx/patches-3.10/127-MIPS-BCM47XX-add-button-and-led-configuration-for-so.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From 9894af92816e729162812f2554c9d97578138834 Mon Sep 17 00:00:00 2001
-From: Hauke Mehrtens <hauke@hauke-m.de>
-Date: Fri, 10 Jan 2014 23:55:28 +0100
-Subject: [PATCH 1/2] MIPS: BCM47XX: add button and led configuration for some
- Linksys devices
-
-This adds led and button GPIO configuration for Linksys wrt54g3gv2,
-wrt54gsv1 and wrtsl54gs. This is based on OpenWrt broadcom-diag code.
-
-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
----
- arch/mips/bcm47xx/buttons.c |   27 +++++++++++++++++++++++++++
- arch/mips/bcm47xx/leds.c    |   33 +++++++++++++++++++++++++++++++++
- 2 files changed, 60 insertions(+)
-
---- a/arch/mips/bcm47xx/buttons.c
-+++ b/arch/mips/bcm47xx/buttons.c
-@@ -259,6 +259,18 @@ bcm47xx_buttons_linksys_wrt310nv1[] __in
- };
- 
- static const struct gpio_keys_button
-+bcm47xx_buttons_linksys_wrt54g3gv2[] __initconst = {
-+      BCM47XX_GPIO_KEY(5, KEY_WIMAX),
-+      BCM47XX_GPIO_KEY(6, KEY_RESTART),
-+};
-+
-+static const struct gpio_keys_button
-+bcm47xx_buttons_linksys_wrt54gsv1[] __initconst = {
-+      BCM47XX_GPIO_KEY(4, KEY_WPS_BUTTON),
-+      BCM47XX_GPIO_KEY(6, KEY_RESTART),
-+};
-+
-+static const struct gpio_keys_button
- bcm47xx_buttons_linksys_wrt610nv1[] __initconst = {
-       BCM47XX_GPIO_KEY(6, KEY_RESTART),
-       BCM47XX_GPIO_KEY(8, KEY_WPS_BUTTON),
-@@ -270,6 +282,12 @@ bcm47xx_buttons_linksys_wrt610nv2[] __in
-       BCM47XX_GPIO_KEY(6, KEY_RESTART),
- };
- 
-+static const struct gpio_keys_button
-+bcm47xx_buttons_linksys_wrtsl54gs[] __initconst = {
-+      BCM47XX_GPIO_KEY(4, KEY_WPS_BUTTON),
-+      BCM47XX_GPIO_KEY(6, KEY_RESTART),
-+};
-+
- /* Motorola */
- 
- static const struct gpio_keys_button
-@@ -479,12 +497,21 @@ int __init bcm47xx_buttons_register(void
-       case BCM47XX_BOARD_LINKSYS_WRT310NV1:
-               err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310nv1);
-               break;
-+      case BCM47XX_BOARD_LINKSYS_WRT54GSV1:
-+              err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt54gsv1);
-+              break;
-+      case BCM47XX_BOARD_LINKSYS_WRT54G3GV2:
-+              err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt54g3gv2);
-+              break;
-       case BCM47XX_BOARD_LINKSYS_WRT610NV1:
-               err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt610nv1);
-               break;
-       case BCM47XX_BOARD_LINKSYS_WRT610NV2:
-               err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt610nv2);
-               break;
-+      case BCM47XX_BOARD_LINKSYS_WRTSL54GS:
-+              err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrtsl54gs);
-+              break;
- 
-       case BCM47XX_BOARD_MOTOROLA_WE800G:
-               err = bcm47xx_copy_bdata(bcm47xx_buttons_motorola_we800g);
---- a/arch/mips/bcm47xx/leds.c
-+++ b/arch/mips/bcm47xx/leds.c
-@@ -292,6 +292,21 @@ bcm47xx_leds_linksys_wrt310nv1[] __initc
- };
- 
- static const struct gpio_led
-+bcm47xx_leds_linksys_wrt54gsv1[] __initconst = {
-+      BCM47XX_GPIO_LED(0, "unk", "dmz", 1, LEDS_GPIO_DEFSTATE_OFF),
-+      BCM47XX_GPIO_LED(1, "unk", "power", 0, LEDS_GPIO_DEFSTATE_ON),
-+      BCM47XX_GPIO_LED(5, "white", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
-+      BCM47XX_GPIO_LED(7, "orange", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
-+};
-+
-+static const struct gpio_led
-+bcm47xx_leds_linksys_wrt54g3gv2[] __initconst = {
-+      BCM47XX_GPIO_LED(1, "unk", "power", 0, LEDS_GPIO_DEFSTATE_ON),
-+      BCM47XX_GPIO_LED(2, "green", "3g", 0, LEDS_GPIO_DEFSTATE_OFF),
-+      BCM47XX_GPIO_LED(3, "blue", "3g", 0, LEDS_GPIO_DEFSTATE_OFF),
-+};
-+
-+static const struct gpio_led
- bcm47xx_leds_linksys_wrt610nv1[] __initconst = {
-       BCM47XX_GPIO_LED(0, "unk", "usb",  1, LEDS_GPIO_DEFSTATE_OFF),
-       BCM47XX_GPIO_LED(1, "unk", "power",  0, LEDS_GPIO_DEFSTATE_OFF),
-@@ -308,6 +323,15 @@ bcm47xx_leds_linksys_wrt610nv2[] __initc
-       BCM47XX_GPIO_LED(7, "unk", "usb", 0, LEDS_GPIO_DEFSTATE_OFF),
- };
- 
-+static const struct gpio_led
-+bcm47xx_leds_linksys_wrtsl54gs[] __initconst = {
-+      BCM47XX_GPIO_LED(0, "unk", "wlan", 1, LEDS_GPIO_DEFSTATE_OFF),
-+      BCM47XX_GPIO_LED(1, "unk", "power", 0, LEDS_GPIO_DEFSTATE_ON),
-+      BCM47XX_GPIO_LED(2, "white", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
-+      BCM47XX_GPIO_LED(3, "orange", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
-+      BCM47XX_GPIO_LED(7, "unk", "dmz", 1, LEDS_GPIO_DEFSTATE_OFF),
-+};
-+
- /* Motorola */
- 
- static const struct gpio_led
-@@ -502,12 +526,21 @@ void __init bcm47xx_leds_register(void)
-       case BCM47XX_BOARD_LINKSYS_WRT310NV1:
-               bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt310nv1);
-               break;
-+      case BCM47XX_BOARD_LINKSYS_WRT54GSV1:
-+              bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54gsv1);
-+              break;
-+      case BCM47XX_BOARD_LINKSYS_WRT54G3GV2:
-+              bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54g3gv2);
-+              break;
-       case BCM47XX_BOARD_LINKSYS_WRT610NV1:
-               bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt610nv1);
-               break;
-       case BCM47XX_BOARD_LINKSYS_WRT610NV2:
-               bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt610nv2);
-               break;
-+      case BCM47XX_BOARD_LINKSYS_WRTSL54GS:
-+              bcm47xx_set_pdata(bcm47xx_leds_linksys_wrtsl54gs);
-+              break;
- 
-       case BCM47XX_BOARD_MOTOROLA_WE800G:
-               bcm47xx_set_pdata(bcm47xx_leds_motorola_we800g);