[brcm63xx] fix clocks bits for BCM6345

[openwrt.git] / target / linux / brcm63xx / patches-3.3 / 301-led_count.patch

diff --git a/target/linux/brcm63xx/patches-3.3/301-led_count.patch b/target/linux/brcm63xx/patches-3.3/301-led_count.patch
index 6dfa42d994b15350524ef6a4d251299edb7340bb..b6c1196a52a0aaec29b7f4a1f983bedd0c990688 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/301-led_count.patch
+++ b/target/linux/brcm63xx/patches-3.3/301-led_count.patch
@@ -1,23 +1,41 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -889,6 +889,7 @@ int __init board_register_devices(void)
+@@ -862,6 +862,7 @@ static struct platform_device bcm63xx_gp
+ int __init board_register_devices(void)
  {
-       u32 val;
        int button_count = 0;
 +      int led_count = 0;
  
        if (board.has_uart0)
                bcm63xx_uart_register(0);
-@@ -932,7 +933,11 @@ int __init board_register_devices(void)
+@@ -900,10 +901,16 @@ int __init board_register_devices(void)
  
-       platform_device_register(&mtd_dev);
+       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++;
 +
-+      bcm63xx_led_data.num_leds = led_count;
-       bcm63xx_led_data.leds = board.leds;
++      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);
++              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];