aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Dickinson <daniel@cshore.neomailbox.net>2010-12-07 15:15:47 +0000
committerDaniel Dickinson <daniel@cshore.neomailbox.net>2010-12-07 15:15:47 +0000
commit5ac34fd9f0e9af358d67ccd3123ad3267d1f691e (patch)
treefdb636607a34ca5f91e46f880239dc2a78fe3533
parent903d1b5311096893f39534043f9d9d73ffb6ece9 (diff)
downloadupstream-5ac34fd9f0e9af358d67ccd3123ad3267d1f691e.tar.gz
upstream-5ac34fd9f0e9af358d67ccd3123ad3267d1f691e.tar.bz2
upstream-5ac34fd9f0e9af358d67ccd3123ad3267d1f691e.zip
[brcm63xx] board definitions: Added patch for calculating led count, which was part of the patch removed in the previous commit
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24303 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/brcm63xx/patches-2.6.35/150-led_count23
1 files changed, 23 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-2.6.35/150-led_count b/target/linux/brcm63xx/patches-2.6.35/150-led_count
new file mode 100644
index 0000000000..baf092053d
--- /dev/null
+++ b/target/linux/brcm63xx/patches-2.6.35/150-led_count
@@ -0,0 +1,23 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -881,6 +881,7 @@ int __init board_register_devices(void)
+ {
+ u32 val;
+ int button_count = 0;
++ int led_count = 0;
+
+ if (board.has_uart0)
+ bcm63xx_uart_register(0);
+@@ -922,7 +923,11 @@ int __init board_register_devices(void)
+
+ platform_device_register_simple("GPIODEV", 0, &gpiodev_resource, 1);
+
+- bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds);
++ /* count number of LEDs defined by this device */
++ while (led_count < ARRAY_SIZE(board.leds) && board.leds[led_count].name)
++ led_count++;
++
++ bcm63xx_led_data.num_leds = led_count;
+ bcm63xx_led_data.leds = board.leds;
+
+ platform_device_register(&bcm63xx_gpio_leds);