Merge tag 'upstream-3.8-rc1' of git://git.infradead.org/linux-ubi

[karo-tx-linux.git] / drivers / power / abx500_chargalg.c

diff --git a/drivers/power/abx500_chargalg.c b/drivers/power/abx500_chargalg.c
index 19f25419079056b5a27260e53ce70639b0eeabdd..2970891460641177f53449dc1ff32b33ed26a375 100644 (file)
--- a/drivers/power/abx500_chargalg.c
+++ b/drivers/power/abx500_chargalg.c
@@ -21,6 +21,8 @@
 #include <linux/completion.h>
 #include <linux/workqueue.h>
 #include <linux/kobject.h>
+#include <linux/of.h>
+#include <linux/mfd/core.h>
 #include <linux/mfd/abx500.h>
 #include <linux/mfd/abx500/ux500_chargalg.h>
 #include <linux/mfd/abx500/ab8500-bm.h>
@@ -205,7 +207,6 @@ enum maxim_ret {
  * @chg_info:          information about connected charger types
  * @batt_data:         data of the battery
  * @susp_status:       current charger suspension status
- * @pdata:             pointer to the abx500_chargalg platform data
  * @bat:               pointer to the abx500_bm platform data
  * @chargalg_psy:      structure that holds the battery properties exposed by
  *                     the charging algorithm
@@ -231,7 +232,6 @@ struct abx500_chargalg {
        struct abx500_chargalg_charger_info chg_info;
        struct abx500_chargalg_battery_data batt_data;
        struct abx500_chargalg_suspension_status susp_status;
-       struct abx500_chargalg_platform_data *pdata;
        struct abx500_bm_data *bat;
        struct power_supply chargalg_psy;
        struct ux500_charger *ac_chg;
@@ -1795,36 +1795,53 @@ static int abx500_chargalg_remove(struct platform_device *pdev)
        flush_scheduled_work();
        power_supply_unregister(&di->chargalg_psy);
        platform_set_drvdata(pdev, NULL);
-       kfree(di);
 
        return 0;
 }
 
+static char *supply_interface[] = {
+       "ab8500_fg",
+};
+
 static int abx500_chargalg_probe(struct platform_device *pdev)
 {
-       struct abx500_bm_plat_data *plat_data;
+       struct device_node *np = pdev->dev.of_node;
+       struct abx500_chargalg *di;
        int ret = 0;
 
-       struct abx500_chargalg *di =
-               kzalloc(sizeof(struct abx500_chargalg), GFP_KERNEL);
-       if (!di)
+       di = devm_kzalloc(&pdev->dev, sizeof(*di), GFP_KERNEL);
+       if (!di) {
+               dev_err(&pdev->dev, "%s no mem for ab8500_chargalg\n", __func__);
                return -ENOMEM;
+       }
+       di->bat = pdev->mfd_cell->platform_data;
+       if (!di->bat) {
+               if (np) {
+                       ret = bmdevs_of_probe(&pdev->dev, np, &di->bat);
+                       if (ret) {
+                               dev_err(&pdev->dev,
+                                       "failed to get battery information\n");
+                               return ret;
+                       }
+               } else {
+                       dev_err(&pdev->dev, "missing dt node for ab8500_chargalg\n");
+                       return -EINVAL;
+               }
+       } else {
+               dev_info(&pdev->dev, "falling back to legacy platform data\n");
+       }
 
        /* get device struct */
        di->dev = &pdev->dev;
 
-       plat_data = pdev->dev.platform_data;
-       di->pdata = plat_data->chargalg;
-       di->bat = plat_data->battery;
-
        /* chargalg supply */
        di->chargalg_psy.name = "abx500_chargalg";
        di->chargalg_psy.type = POWER_SUPPLY_TYPE_BATTERY;
        di->chargalg_psy.properties = abx500_chargalg_props;
        di->chargalg_psy.num_properties = ARRAY_SIZE(abx500_chargalg_props);
        di->chargalg_psy.get_property = abx500_chargalg_get_property;
-       di->chargalg_psy.supplied_to = di->pdata->supplied_to;
-       di->chargalg_psy.num_supplicants = di->pdata->num_supplicants;
+       di->chargalg_psy.supplied_to = supply_interface;
+       di->chargalg_psy.num_supplicants = ARRAY_SIZE(supply_interface),
        di->chargalg_psy.external_power_changed =
                abx500_chargalg_external_power_changed;
 
@@ -1844,7 +1861,7 @@ static int abx500_chargalg_probe(struct platform_device *pdev)
                create_singlethread_workqueue("abx500_chargalg_wq");
        if (di->chargalg_wq == NULL) {
                dev_err(di->dev, "failed to create work queue\n");
-               goto free_device_info;
+               return -ENOMEM;
        }
 
        /* Init work for chargalg */
@@ -1885,20 +1902,23 @@ free_psy:
        power_supply_unregister(&di->chargalg_psy);
 free_chargalg_wq:
        destroy_workqueue(di->chargalg_wq);
-free_device_info:
-       kfree(di);
-
        return ret;
 }
 
+static const struct of_device_id ab8500_chargalg_match[] = {
+       { .compatible = "stericsson,ab8500-chargalg", },
+       { },
+};
+
 static struct platform_driver abx500_chargalg_driver = {
        .probe = abx500_chargalg_probe,
        .remove = abx500_chargalg_remove,
        .suspend = abx500_chargalg_suspend,
        .resume = abx500_chargalg_resume,
        .driver = {
-               .name = "abx500-chargalg",
+               .name = "ab8500-chargalg",
                .owner = THIS_MODULE,
+               .of_match_table = ab8500_chargalg_match,
        },
 };