aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.8/301-led_count.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2013-02-04 10:19:55 +0000
committerJonas Gorski <jogo@openwrt.org>2013-02-04 10:19:55 +0000
commit8506964e6d6f89ae67951d0eafe4717b63b1f610 (patch)
treea60f167fa77a88974c7304c47fd3c0a29a43505e /target/linux/brcm63xx/patches-3.8/301-led_count.patch
parent3b4fced67dad0b733d77f78205cfecfc0d654695 (diff)
downloadupstream-8506964e6d6f89ae67951d0eafe4717b63b1f610.tar.gz
upstream-8506964e6d6f89ae67951d0eafe4717b63b1f610.tar.bz2
upstream-8506964e6d6f89ae67951d0eafe4717b63b1f610.zip
bcm63xx: add support for linux 3.8
Based on 3.8-rc6 Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 35482
Diffstat (limited to 'target/linux/brcm63xx/patches-3.8/301-led_count.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.8/301-led_count.patch41
1 files changed, 41 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-3.8/301-led_count.patch b/target/linux/brcm63xx/patches-3.8/301-led_count.patch
new file mode 100644
index 0000000000..1c6797933c
--- /dev/null
+++ b/target/linux/brcm63xx/patches-3.8/301-led_count.patch
@@ -0,0 +1,41 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -869,6 +869,7 @@ static struct platform_device bcm63xx_gp
+ int __init board_register_devices(void)
+ {
+ int button_count = 0;
++ int led_count = 0;
+
+ if (board.has_uart0)
+ bcm63xx_uart_register(0);
+@@ -916,10 +917,16 @@ int __init board_register_devices(void)
+
+ bcm63xx_flash_register();
+
+- bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds);
+- bcm63xx_led_data.leds = board.leds;
++ /* count number of LEDs defined by this device */
++ while (led_count < ARRAY_SIZE(board.leds) && board.leds[led_count].name)
++ led_count++;
++
++ if (led_count) {
++ bcm63xx_led_data.num_leds = led_count;
++ bcm63xx_led_data.leds = board.leds;
+
+- platform_device_register(&bcm63xx_gpio_leds);
++ platform_device_register(&bcm63xx_gpio_leds);
++ }
+
+ /* count number of BUTTONs defined by this device */
+ while (button_count < ARRAY_SIZE(board.buttons) && board.buttons[button_count].desc)
+--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
++++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
+@@ -45,7 +45,7 @@ struct board_info {
+ struct bcm63xx_dsp_platform_data dsp;
+
+ /* GPIO LEDs */
+- struct gpio_led leds[5];
++ struct gpio_led leds[14];
+
+ /* Buttons */
+ struct gpio_keys_button buttons[4];