projects / 15.05 / openwrt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4b085f6)
brcm47xx: fix LEDs on WRT54GL 1.1
authorHauke Mehrtens <hauke@openwrt.org>
Tue, 15 Jul 2014 21:54:38 +0000 (21:54 +0000)
committerHauke Mehrtens <hauke@openwrt.org>
Tue, 15 Jul 2014 21:54:38 +0000 (21:54 +0000)
Ticket: #17062
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41666 3c298f89-4303-0410-b956-a3cf2f4a3e73

target/linux/brcm47xx/patches-3.10/146-MIPS-BCM47XX-Devices-database-update-for-3.17.patch patch | blob | history
target/linux/brcm47xx/patches-3.10/149-MIPS-BCM47XX-add-some-more-devices.patch patch | blob | history
target/linux/brcm47xx/patches-3.14/146-MIPS-BCM47XX-Devices-database-update-for-3.17.patch patch | blob | history
target/linux/brcm47xx/patches-3.14/149-MIPS-BCM47XX-add-some-more-devices.patch patch | blob | history

diff --git a/target/linux/brcm47xx/patches-3.10/146-MIPS-BCM47XX-Devices-database-update-for-3.17.patch b/target/linux/brcm47xx/patches-3.10/146-MIPS-BCM47XX-Devices-database-update-for-3.17.patch
index aa3e7ac..db965b1 100644 (file)
--- a/target/linux/brcm47xx/patches-3.10/146-MIPS-BCM47XX-Devices-database-update-for-3.17.patch
+++ b/target/linux/brcm47xx/patches-3.10/146-MIPS-BCM47XX-Devices-database-update-for-3.17.patch
@@ -38,7 +38,24 @@
        BCM47XX_GPIO_LED(7, "amber", "wps", 0, LEDS_GPIO_DEFSTATE_OFF),
        BCM47XX_GPIO_LED(8, "blue", "wps", 0, LEDS_GPIO_DEFSTATE_OFF),
  };
-@@ -333,11 +342,10 @@ bcm47xx_leds_linksys_wrt610nv2[] __initc
+@@ -314,6 +323,16 @@ bcm47xx_leds_linksys_wrt54g_type_0101[]
+       BCM47XX_GPIO_LED(7, "green", "dmz", 1, LEDS_GPIO_DEFSTATE_OFF),
+ };
+ 
++/* Verified on: WRT54GL V1.1 */
++static const struct gpio_led
++bcm47xx_leds_linksys_wrt54g_type_0467[] __initconst = {
++      BCM47XX_GPIO_LED(0, "green", "wlan", 1, LEDS_GPIO_DEFSTATE_OFF),
++      BCM47XX_GPIO_LED(1, "green", "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, "green", "dmz", 1, 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),
+@@ -333,11 +352,10 @@ bcm47xx_leds_linksys_wrt610nv2[] __initc
  
  static const struct gpio_led
  bcm47xx_leds_linksys_wrtsl54gs[] __initconst = {
@@ -54,7 +71,7 @@
  };
  
  /* Motorola */
-@@ -385,6 +393,15 @@ bcm47xx_leds_netgear_wndr4500v1[] __init
+@@ -385,6 +403,15 @@ bcm47xx_leds_netgear_wndr4500v1[] __init
  };
  
  static const struct gpio_led
@@ -70,7 +87,7 @@
  bcm47xx_leds_netgear_wnr834bv2[] __initconst = {
        BCM47XX_GPIO_LED(2, "green", "power", 0, LEDS_GPIO_DEFSTATE_ON),
        BCM47XX_GPIO_LED(3, "amber", "power", 0, LEDS_GPIO_DEFSTATE_OFF),
-@@ -425,6 +442,9 @@ void __init bcm47xx_leds_register(void)
+@@ -425,6 +452,9 @@ void __init bcm47xx_leds_register(void)
        case BCM47XX_BOARD_ASUS_RTN12:
                bcm47xx_set_pdata(bcm47xx_leds_asus_rtn12);
                break;
@@ -80,7 +97,16 @@
        case BCM47XX_BOARD_ASUS_RTN16:
                bcm47xx_set_pdata(bcm47xx_leds_asus_rtn16);
                break;
-@@ -582,6 +602,9 @@ void __init bcm47xx_leds_register(void)
+@@ -553,6 +583,8 @@ void __init bcm47xx_leds_register(void)
+               bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54g_type_0101);
+               break;
+       case BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467:
++              bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54g_type_0467);
++              break;
+       case BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0708:
+               bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54g_generic);
+               break;
+@@ -582,6 +614,9 @@ void __init bcm47xx_leds_register(void)
        case BCM47XX_BOARD_NETGEAR_WNDR4500V1:
                bcm47xx_set_pdata(bcm47xx_leds_netgear_wndr4500v1);
                break;
diff --git a/target/linux/brcm47xx/patches-3.10/149-MIPS-BCM47XX-add-some-more-devices.patch b/target/linux/brcm47xx/patches-3.10/149-MIPS-BCM47XX-add-some-more-devices.patch
index 279b251..3b7f136 100644 (file)
--- a/target/linux/brcm47xx/patches-3.10/149-MIPS-BCM47XX-add-some-more-devices.patch
+++ b/target/linux/brcm47xx/patches-3.10/149-MIPS-BCM47XX-add-some-more-devices.patch
@@ -109,7 +109,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  bcm47xx_leds_asus_wl500gd[] __initconst = {
        BCM47XX_GPIO_LED(0, "unk", "power", 1, LEDS_GPIO_DEFSTATE_ON),
  };
-@@ -348,6 +353,13 @@ bcm47xx_leds_linksys_wrtsl54gs[] __initc
+@@ -358,6 +363,13 @@ bcm47xx_leds_linksys_wrtsl54gs[] __initc
        BCM47XX_GPIO_LED(7, "orange", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
  };
  
@@ -123,7 +123,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  /* Motorola */
  
  static const struct gpio_led
-@@ -460,6 +472,9 @@ void __init bcm47xx_leds_register(void)
+@@ -470,6 +482,9 @@ void __init bcm47xx_leds_register(void)
        case BCM47XX_BOARD_ASUS_WL330GE:
                bcm47xx_set_pdata(bcm47xx_leds_asus_wl330ge);
                break;
@@ -133,7 +133,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
        case BCM47XX_BOARD_ASUS_WL500GD:
                bcm47xx_set_pdata(bcm47xx_leds_asus_wl500gd);
                break;
-@@ -586,6 +601,10 @@ void __init bcm47xx_leds_register(void)
+@@ -598,6 +613,10 @@ void __init bcm47xx_leds_register(void)
                bcm47xx_set_pdata(bcm47xx_leds_linksys_wrtsl54gs);
                break;
  
diff --git a/target/linux/brcm47xx/patches-3.14/146-MIPS-BCM47XX-Devices-database-update-for-3.17.patch b/target/linux/brcm47xx/patches-3.14/146-MIPS-BCM47XX-Devices-database-update-for-3.17.patch
index aa3e7ac..db965b1 100644 (file)
--- a/target/linux/brcm47xx/patches-3.14/146-MIPS-BCM47XX-Devices-database-update-for-3.17.patch
+++ b/target/linux/brcm47xx/patches-3.14/146-MIPS-BCM47XX-Devices-database-update-for-3.17.patch
@@ -38,7 +38,24 @@
        BCM47XX_GPIO_LED(7, "amber", "wps", 0, LEDS_GPIO_DEFSTATE_OFF),
        BCM47XX_GPIO_LED(8, "blue", "wps", 0, LEDS_GPIO_DEFSTATE_OFF),
  };
-@@ -333,11 +342,10 @@ bcm47xx_leds_linksys_wrt610nv2[] __initc
+@@ -314,6 +323,16 @@ bcm47xx_leds_linksys_wrt54g_type_0101[]
+       BCM47XX_GPIO_LED(7, "green", "dmz", 1, LEDS_GPIO_DEFSTATE_OFF),
+ };
+ 
++/* Verified on: WRT54GL V1.1 */
++static const struct gpio_led
++bcm47xx_leds_linksys_wrt54g_type_0467[] __initconst = {
++      BCM47XX_GPIO_LED(0, "green", "wlan", 1, LEDS_GPIO_DEFSTATE_OFF),
++      BCM47XX_GPIO_LED(1, "green", "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, "green", "dmz", 1, 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),
+@@ -333,11 +352,10 @@ bcm47xx_leds_linksys_wrt610nv2[] __initc
  
  static const struct gpio_led
  bcm47xx_leds_linksys_wrtsl54gs[] __initconst = {
@@ -54,7 +71,7 @@
  };
  
  /* Motorola */
-@@ -385,6 +393,15 @@ bcm47xx_leds_netgear_wndr4500v1[] __init
+@@ -385,6 +403,15 @@ bcm47xx_leds_netgear_wndr4500v1[] __init
  };
  
  static const struct gpio_led
@@ -70,7 +87,7 @@
  bcm47xx_leds_netgear_wnr834bv2[] __initconst = {
        BCM47XX_GPIO_LED(2, "green", "power", 0, LEDS_GPIO_DEFSTATE_ON),
        BCM47XX_GPIO_LED(3, "amber", "power", 0, LEDS_GPIO_DEFSTATE_OFF),
-@@ -425,6 +442,9 @@ void __init bcm47xx_leds_register(void)
+@@ -425,6 +452,9 @@ void __init bcm47xx_leds_register(void)
        case BCM47XX_BOARD_ASUS_RTN12:
                bcm47xx_set_pdata(bcm47xx_leds_asus_rtn12);
                break;
@@ -80,7 +97,16 @@
        case BCM47XX_BOARD_ASUS_RTN16:
                bcm47xx_set_pdata(bcm47xx_leds_asus_rtn16);
                break;
-@@ -582,6 +602,9 @@ void __init bcm47xx_leds_register(void)
+@@ -553,6 +583,8 @@ void __init bcm47xx_leds_register(void)
+               bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54g_type_0101);
+               break;
+       case BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467:
++              bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54g_type_0467);
++              break;
+       case BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0708:
+               bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54g_generic);
+               break;
+@@ -582,6 +614,9 @@ void __init bcm47xx_leds_register(void)
        case BCM47XX_BOARD_NETGEAR_WNDR4500V1:
                bcm47xx_set_pdata(bcm47xx_leds_netgear_wndr4500v1);
                break;
diff --git a/target/linux/brcm47xx/patches-3.14/149-MIPS-BCM47XX-add-some-more-devices.patch b/target/linux/brcm47xx/patches-3.14/149-MIPS-BCM47XX-add-some-more-devices.patch
index e1f92ff..43fef0e 100644 (file)
--- a/target/linux/brcm47xx/patches-3.14/149-MIPS-BCM47XX-add-some-more-devices.patch
+++ b/target/linux/brcm47xx/patches-3.14/149-MIPS-BCM47XX-add-some-more-devices.patch
@@ -109,7 +109,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  bcm47xx_leds_asus_wl500gd[] __initconst = {
        BCM47XX_GPIO_LED(0, "unk", "power", 1, LEDS_GPIO_DEFSTATE_ON),
  };
-@@ -348,6 +353,13 @@ bcm47xx_leds_linksys_wrtsl54gs[] __initc
+@@ -358,6 +363,13 @@ bcm47xx_leds_linksys_wrtsl54gs[] __initc
        BCM47XX_GPIO_LED(7, "orange", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
  };
  
@@ -123,7 +123,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  /* Motorola */
  
  static const struct gpio_led
-@@ -460,6 +472,9 @@ void __init bcm47xx_leds_register(void)
+@@ -470,6 +482,9 @@ void __init bcm47xx_leds_register(void)
        case BCM47XX_BOARD_ASUS_WL330GE:
                bcm47xx_set_pdata(bcm47xx_leds_asus_wl330ge);
                break;
@@ -133,7 +133,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
        case BCM47XX_BOARD_ASUS_WL500GD:
                bcm47xx_set_pdata(bcm47xx_leds_asus_wl500gd);
                break;
-@@ -586,6 +601,10 @@ void __init bcm47xx_leds_register(void)
+@@ -598,6 +613,10 @@ void __init bcm47xx_leds_register(void)
                bcm47xx_set_pdata(bcm47xx_leds_linksys_wrtsl54gs);
                break;
  
OpenWrt 15.05 release branch