max8925_power: Add support for device-tree initialization

This patch adds support for initializing platform data from the
device-tree description.

Signed-off-by: Qing Xu <qingx@marvell.com>
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>

diff --git a/drivers/power/max8925_power.c b/drivers/power/max8925_power.c
index daa333bd7ebb199f6c1325f214a6a7c074c0a061..b5a3ccb16a1434dd870cb8052cae94fe08688289 100644 (file)
--- a/drivers/power/max8925_power.c
+++ b/drivers/power/max8925_power.c
@@ -12,6 +12,7 @@
 #include <linux/module.h>
 #include <linux/err.h>
 #include <linux/slab.h>
+#include <linux/of.h>
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
@@ -426,6 +427,54 @@ static __devexit int max8925_deinit_charger(struct max8925_power_info *info)
        return 0;
 }
 
+#ifdef CONFIG_OF
+static struct max8925_power_pdata *
+max8925_power_dt_init(struct platform_device *pdev)
+{
+       struct device_node *nproot = pdev->dev.parent->of_node;
+       struct device_node *np;
+       int batt_detect;
+       int topoff_threshold;
+       int fast_charge;
+       int no_temp_support;
+       int no_insert_detect;
+       struct max8925_power_pdata *pdata;
+
+       if (!nproot)
+               return pdev->dev.platform_data;
+
+       np = of_find_node_by_name(nproot, "charger");
+       if (!np) {
+               dev_err(&pdev->dev, "failed to find charger node\n");
+               return NULL;
+       }
+
+       pdata = devm_kzalloc(&pdev->dev,
+                       sizeof(struct max8925_power_pdata),
+                       GFP_KERNEL);
+
+       of_property_read_u32(np, "topoff-threshold", &topoff_threshold);
+       of_property_read_u32(np, "batt-detect", &batt_detect);
+       of_property_read_u32(np, "fast-charge", &fast_charge);
+       of_property_read_u32(np, "no-insert-detect", &no_insert_detect);
+       of_property_read_u32(np, "no-temp-support", &no_temp_support);
+
+       pdata->batt_detect = batt_detect;
+       pdata->fast_charge = fast_charge;
+       pdata->topoff_threshold = topoff_threshold;
+       pdata->no_insert_detect = no_insert_detect;
+       pdata->no_temp_support = no_temp_support;
+
+       return pdata;
+}
+#else
+static struct max8925_power_pdata *
+max8925_power_dt_init(struct platform_device *pdev)
+{
+       return pdev->dev.platform_data;
+}
+#endif
+
 static __devinit int max8925_power_probe(struct platform_device *pdev)
 {
        struct max8925_chip *chip = dev_get_drvdata(pdev->dev.parent);
@@ -433,7 +482,7 @@ static __devinit int max8925_power_probe(struct platform_device *pdev)
        struct max8925_power_info *info;
        int ret;
 
-       pdata = pdev->dev.platform_data;
+       pdata = max8925_power_dt_init(pdev);
        if (!pdata) {
                dev_err(&pdev->dev, "platform data isn't assigned to "
                        "power supply\n");