diff options
author | Jonas Gorski <jogo@openwrt.org> | 2013-07-20 11:30:26 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2013-07-20 11:30:26 +0000 |
commit | 2f038ae881a80ac4edf5a5e5f16e6c6cf4faaa9c (patch) | |
tree | 97aa81a655299693d0ea0196efb50a79a13d7566 /target/linux/brcm63xx/patches-3.10/301-led_count.patch | |
parent | c38dd0ac480380e45436ff89a8b5a0ba4d7a981b (diff) | |
download | upstream-2f038ae881a80ac4edf5a5e5f16e6c6cf4faaa9c.tar.gz upstream-2f038ae881a80ac4edf5a5e5f16e6c6cf4faaa9c.tar.bz2 upstream-2f038ae881a80ac4edf5a5e5f16e6c6cf4faaa9c.zip |
brcm63xx: add linux 3.10 support
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37481 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.10/301-led_count.patch')
-rw-r--r-- | target/linux/brcm63xx/patches-3.10/301-led_count.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-3.10/301-led_count.patch b/target/linux/brcm63xx/patches-3.10/301-led_count.patch new file mode 100644 index 0000000000..e8234b0285 --- /dev/null +++ b/target/linux/brcm63xx/patches-3.10/301-led_count.patch @@ -0,0 +1,41 @@ +--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c ++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +@@ -911,6 +911,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); +@@ -962,10 +963,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); ++ } + + if (board.ephy_reset_gpio && board.ephy_reset_gpio_flags) + gpio_request_one(board.ephy_reset_gpio, +--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h ++++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h +@@ -47,7 +47,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]; |