atheros: v3.18: rearrange code between patches

[openwrt/openwrt.git] / target / linux / atheros / patches-3.18 / 330-board_leds.patch

diff --git a/target/linux/atheros/patches-3.18/330-board_leds.patch b/target/linux/atheros/patches-3.18/330-board_leds.patch
new file mode 100644 (file)
index 0000000..d069595
--- /dev/null
+++ b/target/linux/atheros/patches-3.18/330-board_leds.patch
@@ -0,0 +1,116 @@
+--- a/arch/mips/ath25/ar2315.c
++++ b/arch/mips/ath25/ar2315.c
+@@ -26,6 +26,7 @@
+ #include <linux/reboot.h>
+ #include <linux/delay.h>
+ #include <linux/gpio.h>
++#include <linux/leds.h>
+ #include <asm/bootinfo.h>
+ #include <asm/reboot.h>
+ #include <asm/time.h>
+@@ -265,6 +266,50 @@ static struct platform_device ar2315_spi
+       .num_resources = ARRAY_SIZE(ar2315_spiflash_res)
+ };
+ 
++#ifdef CONFIG_LEDS_GPIO
++static struct gpio_led ar2315_leds[6];
++static struct gpio_led_platform_data ar2315_led_data = {
++      .leds = (void *)ar2315_leds,
++};
++
++static struct platform_device ar2315_gpio_leds = {
++      .name = "leds-gpio",
++      .id = -1,
++      .dev = {
++              .platform_data = (void *)&ar2315_led_data,
++      }
++};
++
++static void __init ar2315_init_gpio_leds(void)
++{
++      static char led_names[6][6];
++      int i, led = 0;
++
++      ar2315_led_data.num_leds = 0;
++      for (i = 1; i < 8; i++) {
++              if ((i == AR2315_RESET_GPIO) ||
++                  (i == ath25_board.config->reset_config_gpio))
++                      continue;
++
++              if (i == ath25_board.config->sys_led_gpio)
++                      strcpy(led_names[led], "wlan");
++              else
++                      sprintf(led_names[led], "gpio%d", i);
++
++              ar2315_leds[led].name = led_names[led];
++              ar2315_leds[led].gpio = i;
++              ar2315_leds[led].active_low = 0;
++              led++;
++      }
++      ar2315_led_data.num_leds = led;
++      platform_device_register(&ar2315_gpio_leds);
++}
++#else
++static inline void ar2315_init_gpio_leds(void)
++{
++}
++#endif
++
+ void __init ar2315_init_devices(void)
+ {
+       /* Find board configuration */
+@@ -275,6 +320,8 @@ void __init ar2315_init_devices(void)
+       ar2315_gpio_res[1].end = ar2315_gpio_res[1].start;
+       platform_device_register(&ar2315_gpio);
+ 
++      ar2315_init_gpio_leds();
++
+       ar2315_wdt_res[1].start = irq_create_mapping(ar2315_misc_irq_domain,
+                                                    AR2315_MISC_IRQ_WATCHDOG);
+       ar2315_wdt_res[1].end = ar2315_wdt_res[1].start;
+--- a/arch/mips/ath25/ar5312.c
++++ b/arch/mips/ath25/ar5312.c
+@@ -26,6 +26,7 @@
+ #include <linux/irqdomain.h>
+ #include <linux/reboot.h>
+ #include <linux/gpio.h>
++#include <linux/leds.h>
+ #include <asm/bootinfo.h>
+ #include <asm/reboot.h>
+ #include <asm/time.h>
+@@ -236,6 +237,23 @@ static struct platform_device ar5312_gpi
+       .num_resources = ARRAY_SIZE(ar5312_gpio_res),
+ };
+ 
++#ifdef CONFIG_LEDS_GPIO
++static struct gpio_led ar5312_leds[] = {
++      { .name = "wlan", .gpio = 0, .active_low = 1, },
++};
++
++static const struct gpio_led_platform_data ar5312_led_data = {
++      .num_leds = ARRAY_SIZE(ar5312_leds),
++      .leds = (void *)ar5312_leds,
++};
++
++static struct platform_device ar5312_gpio_leds = {
++      .name = "leds-gpio",
++      .id = -1,
++      .dev.platform_data = (void *)&ar5312_led_data,
++};
++#endif
++
+ static void __init ar5312_flash_init(void)
+ {
+       void __iomem *flashctl_base;
+@@ -306,6 +324,11 @@ void __init ar5312_init_devices(void)
+ 
+       platform_device_register(&ar5312_gpio);
+ 
++#ifdef CONFIG_LEDS_GPIO
++      ar5312_leds[0].gpio = config->sys_led_gpio;
++      platform_device_register(&ar5312_gpio_leds);
++#endif
++
+       /* Fix up MAC addresses if necessary */
+       if (is_broadcast_ether_addr(config->enet0_mac))
+               ether_addr_copy(config->enet0_mac, config->enet1_mac);