diff options
author | Florian Fainelli <florian@openwrt.org> | 2012-10-25 21:16:51 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2012-10-25 21:16:51 +0000 |
commit | 8d69af7c9fff947e2e53ba955cf6c84df3f1391e (patch) | |
tree | 192a79439e8d6b82dd39af6ac6f019c472cdc1c3 /target/linux/brcm63xx/patches-3.6/301-led_count.patch | |
parent | 6a699a8ae80b5b6ff6559bad1297242c8daf8934 (diff) | |
download | upstream-8d69af7c9fff947e2e53ba955cf6c84df3f1391e.tar.gz upstream-8d69af7c9fff947e2e53ba955cf6c84df3f1391e.tar.bz2 upstream-8d69af7c9fff947e2e53ba955cf6c84df3f1391e.zip |
add preliminary support for 3.6 kernel
SVN-Revision: 33936
Diffstat (limited to 'target/linux/brcm63xx/patches-3.6/301-led_count.patch')
-rw-r--r-- | target/linux/brcm63xx/patches-3.6/301-led_count.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-3.6/301-led_count.patch b/target/linux/brcm63xx/patches-3.6/301-led_count.patch new file mode 100644 index 0000000000..0111bd6c08 --- /dev/null +++ b/target/linux/brcm63xx/patches-3.6/301-led_count.patch @@ -0,0 +1,41 @@ +--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c ++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +@@ -907,6 +907,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); +@@ -945,10 +946,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 +@@ -57,7 +57,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]; |