leds: lp55xx: add support for Device Tree bindings

This patch allows the lp5521 driver to be successfully probed and
initialised when Device Tree support is enabled.

Based on a patch by Gabriel Fernandez, rewritten in accordance
with review feedback.

Cc: Gabriel Fernandez <gabriel.fernandez@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Milo Kim <milo.kim@ti.com>
Signed-off-by: Bryan Wu <cooloney@gmail.com>

1 files changed, 15 insertions, 5 deletions

diff --git a/drivers/leds/leds-lp5521.c b/drivers/leds/leds-lp5521.c
index 19752c928aa2..d461e2664b09 100644
--- a/drivers/leds/leds-lp5521.c
+++ b/drivers/leds/leds-lp5521.c
@@ -31,6 +31,7 @@
 #include <linux/mutex.h>
 #include <linux/platform_data/leds-lp55xx.h>
 #include <linux/slab.h>
+#include <linux/of.h>
 
 #include "leds-lp55xx-common.h"
 
@@ -416,12 +417,20 @@ static int lp5521_probe(struct i2c_client *client,
         int ret;
         struct lp55xx_chip *chip;
         struct lp55xx_led *led;
-        struct lp55xx_platform_data *pdata = client->dev.platform_data;
-
-        if (!pdata) {
-                dev_err(&client->dev, "no platform data\n");
-                return -EINVAL;
+        struct lp55xx_platform_data *pdata;
+        struct device_node *np = client->dev.of_node;
+
+        if (!client->dev.platform_data) {
+                if (np) {
+                        ret = lp55xx_of_populate_pdata(&client->dev, np);
+                        if (ret < 0)
+                                return ret;
+                } else {
+                        dev_err(&client->dev, "no platform data\n");
+                        return -EINVAL;
+                }
         }
+        pdata = client->dev.platform_data;
 
         chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
         if (!chip)
@@ -481,6 +490,7 @@ static int lp5521_remove(struct i2c_client *client)
 
 static const struct i2c_device_id lp5521_id[] = {
         { "lp5521", 0 }, /* Three channel chip */
+        { "national,lp5521", 0 }, /* OF compatible */
         { }
 };
 MODULE_DEVICE_TABLE(i2c, lp5521_id);