Merge tag 'orion_boards_for_3.8' of git://git.infradead.org/users/jcooper/linux into next/boards

From Jason Cooper:
orion boards for v3.8

 - mach-orion5x/ joins the dark side! (devicetree)
 - Lacie Network Space family
 - Lacie Ethernet Disk mini v2
 - USI TopKick
 - ZyXEL NSA310
 - MPL CEC4
 - Plat'Home OpenBlocks A6 (kirkwood, AX3-4 is armada xp)

* tag 'orion_boards_for_3.8' of git://git.infradead.org/users/jcooper/linux:
  ARM: kirkwood: Add Plat'Home OpenBlocks A6 support
  ARM: Dove: update defconfig
  ARM: Kirkwood: update defconfig for new boards
  arm: orion5x: add DT related options in defconfig
  arm: orion5x: convert 'LaCie Ethernet Disk mini v2' to Device Tree
  arm: orion5x: basic Device Tree support
  arm: orion5x: mechanical defconfig update
  ARM: kirkwood: Add support for the MPL CEC4
  arm: kirkwood: add support for ZyXEL NSA310
  ARM: Kirkwood: new board USI Topkick
  ARM: kirkwood: use gpio-fan DT binding on lsxl
  ARM: Kirkwood: add Netspace boards to defconfig
  ARM: kirkwood: DT board setup for Network Space Mini v2
  ARM: kirkwood: DT board setup for Network Space Lite v2
  ARM: kirkwood: DT board setup for Network Space v2 and parents
  leds: leds-ns2: add device tree binding
  ARM: Kirkwood: Enable the second I2C bus

2 files changed, 78 insertions, 4 deletions

diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index f508defc0d96..b58bc8a14b9c 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -379,7 +379,9 @@ config LEDS_NS2
         tristate "LED support for Network Space v2 GPIO LEDs"
         depends on LEDS_CLASS
         depends on MACH_NETSPACE_V2 || MACH_INETSPACE_V2 || \
-                   MACH_NETSPACE_MAX_V2 || MACH_D2NET_V2
+                   MACH_NETSPACE_MAX_V2 || MACH_D2NET_V2 || \
+                   MACH_NETSPACE_V2_DT || MACH_INETSPACE_V2_DT || \
+                   MACH_NETSPACE_MAX_V2_DT || MACH_NETSPACE_MINI_V2_DT
         default y
         help
           This option enable support for the dual-GPIO LED found on the
diff --git a/drivers/leds/leds-ns2.c b/drivers/leds/leds-ns2.c
index d176ec83f5d9..d64cc2227fd9 100644
--- a/drivers/leds/leds-ns2.c
+++ b/drivers/leds/leds-ns2.c
@@ -30,6 +30,7 @@
 #include <linux/leds.h>
 #include <linux/module.h>
 #include <linux/platform_data/leds-kirkwood-ns2.h>
+#include <linux/of_gpio.h>
 
 /*
  * The Network Space v2 dual-GPIO LED is wired to a CPLD and can blink in
@@ -263,6 +264,62 @@ static void delete_ns2_led(struct ns2_led_data *led_dat)
         gpio_free(led_dat->slow);
 }
 
+#ifdef CONFIG_OF_GPIO
+/*
+ * Translate OpenFirmware node properties into platform_data.
+ */
+static int __devinit
+ns2_leds_get_of_pdata(struct device *dev, struct ns2_led_platform_data *pdata)
+{
+        struct device_node *np = dev->of_node;
+        struct device_node *child;
+        struct ns2_led *leds;
+        int num_leds = 0;
+        int i = 0;
+
+        num_leds = of_get_child_count(np);
+        if (!num_leds)
+                return -ENODEV;
+
+        leds = devm_kzalloc(dev, num_leds * sizeof(struct ns2_led),
+                            GFP_KERNEL);
+        if (!leds)
+                return -ENOMEM;
+
+        for_each_child_of_node(np, child) {
+                const char *string;
+                int ret;
+
+                ret = of_get_named_gpio(child, "cmd-gpio", 0);
+                if (ret < 0)
+                        return ret;
+                leds[i].cmd = ret;
+                ret = of_get_named_gpio(child, "slow-gpio", 0);
+                if (ret < 0)
+                        return ret;
+                leds[i].slow = ret;
+                ret = of_property_read_string(child, "label", &string);
+                leds[i].name = (ret == 0) ? string : child->name;
+                ret = of_property_read_string(child, "linux,default-trigger",
+                                              &string);
+                if (ret == 0)
+                        leds[i].default_trigger = string;
+
+                i++;
+        }
+
+        pdata->leds = leds;
+        pdata->num_leds = num_leds;
+
+        return 0;
+}
+
+static const struct of_device_id of_ns2_leds_match[] = {
+        { .compatible = "lacie,ns2-leds", },
+        {},
+};
+#endif /* CONFIG_OF_GPIO */
+
 static int __devinit ns2_led_probe(struct platform_device *pdev)
 {
         struct ns2_led_platform_data *pdata = pdev->dev.platform_data;
@@ -270,11 +327,25 @@ static int __devinit ns2_led_probe(struct platform_device *pdev)
         int i;
         int ret;
 
+#ifdef CONFIG_OF_GPIO
+        if (!pdata) {
+                pdata = devm_kzalloc(&pdev->dev,
+                                     sizeof(struct ns2_led_platform_data),
+                                     GFP_KERNEL);
+                if (!pdata)
+                        return -ENOMEM;
+
+                ret = ns2_leds_get_of_pdata(&pdev->dev, pdata);
+                if (ret)
+                        return ret;
+        }
+#else
         if (!pdata)
                 return -EINVAL;
+#endif /* CONFIG_OF_GPIO */
 
         leds_data = devm_kzalloc(&pdev->dev, sizeof(struct ns2_led_data) *
-                            pdata->num_leds, GFP_KERNEL);
+                                 pdata->num_leds, GFP_KERNEL);
         if (!leds_data)
                 return -ENOMEM;
 
@@ -312,8 +383,9 @@ static struct platform_driver ns2_led_driver = {
         .probe          = ns2_led_probe,
         .remove         = __devexit_p(ns2_led_remove),
         .driver         = {
-                .name   = "leds-ns2",
-                .owner  = THIS_MODULE,
+                .name           = "leds-ns2",
+                .owner          = THIS_MODULE,
+                .of_match_table = of_match_ptr(of_ns2_leds_match),
         },
 };