ab8500-bm: Charge only mode fixes for the ab9540

Fix for charging not getting enabled in charge only mode by
external charger.

Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c
index 3eb23cf9ff476b63d3eb74c22918e6c029fc4969..f1d712308b02762fd82325e660f0b9c6f60e5dd2 100644 (file)
--- a/drivers/power/ab8500_charger.c
+++ b/drivers/power/ab8500_charger.c
@@ -15,6 +15,7 @@
 #include <linux/device.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
+#include <linux/notifier.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>
 #include <linux/power_supply.h>
@@ -97,6 +98,10 @@
 #define AB8500_SW_CONTROL_FALLBACK     0x03
 /* Wait for enumeration before charing in us */
 #define WAIT_ACA_RID_ENUMERATION       (5 * 1000)
+/*External charger control*/
+#define AB8500_SYS_CHARGER_CONTROL_REG         0x52
+#define EXTERNAL_CHARGER_DISABLE_REG_VAL       0x03
+#define EXTERNAL_CHARGER_ENABLE_REG_VAL                0x07
 
 /* UsbLineStatus register - usb types */
 enum ab8500_charger_link_status {
@@ -1678,6 +1683,29 @@ static int ab8500_charger_usb_en(struct ux500_charger *charger,
        return ret;
 }
 
+static int ab8500_external_charger_prepare(struct notifier_block *charger_nb,
+                               unsigned long event, void *data)
+{
+       int ret;
+       struct device *dev = data;
+       /*Toggle External charger control pin*/
+       ret = abx500_set_register_interruptible(dev, AB8500_SYS_CTRL1_BLOCK,
+                                 AB8500_SYS_CHARGER_CONTROL_REG,
+                                 EXTERNAL_CHARGER_DISABLE_REG_VAL);
+       if (ret < 0) {
+               dev_err(dev, "write reg failed %d\n", ret);
+               goto out;
+       }
+       ret = abx500_set_register_interruptible(dev, AB8500_SYS_CTRL1_BLOCK,
+                                 AB8500_SYS_CHARGER_CONTROL_REG,
+                                 EXTERNAL_CHARGER_ENABLE_REG_VAL);
+       if (ret < 0)
+               dev_err(dev, "Write reg failed %d\n", ret);
+
+out:
+       return ret;
+}
+
 /**
  * ab8500_charger_usb_check_enable() - enable usb charging
  * @charger:   pointer to the ux500_charger structure
@@ -3221,6 +3249,10 @@ static int ab8500_charger_suspend(struct platform_device *pdev,
 #define ab8500_charger_resume       NULL
 #endif
 
+static struct notifier_block charger_nb = {
+       .notifier_call = ab8500_external_charger_prepare,
+};
+
 static int ab8500_charger_remove(struct platform_device *pdev)
 {
        struct ab8500_charger *di = platform_get_drvdata(pdev);
@@ -3250,6 +3282,11 @@ static int ab8500_charger_remove(struct platform_device *pdev)
        /* Delete the work queue */
        destroy_workqueue(di->charger_wq);
 
+       /* Unregister external charger enable notifier */
+       if (!di->ac_chg.enabled)
+               blocking_notifier_chain_unregister(
+                       &charger_notifier_list, &charger_nb);
+
        flush_scheduled_work();
        if (di->usb_chg.enabled)
                power_supply_unregister(&di->usb_chg.psy);
@@ -3331,6 +3368,11 @@ static int ab8500_charger_probe(struct platform_device *pdev)
        di->ac_chg.enabled = di->bm->ac_enabled;
        di->ac_chg.external = false;
 
+       /*notifier for external charger enabling*/
+       if (!di->ac_chg.enabled)
+               blocking_notifier_chain_register(
+                       &charger_notifier_list, &charger_nb);
+
        /* USB supply */
        /* power_supply base class */
        di->usb_chg.psy.name = "ab8500_usb";

diff --git a/drivers/power/abx500_chargalg.c b/drivers/power/abx500_chargalg.c
index 8ab65a3a81900431fa74441850c8ccec663549a7..a876976678ab974427c89de3eac8cc3decb2353c 100644 (file)
--- a/drivers/power/abx500_chargalg.c
+++ b/drivers/power/abx500_chargalg.c
@@ -26,6 +26,7 @@
 #include <linux/mfd/abx500.h>
 #include <linux/mfd/abx500/ux500_chargalg.h>
 #include <linux/mfd/abx500/ab8500-bm.h>
+#include <linux/notifier.h>
 
 /* Watchdog kick interval */
 #define CHG_WD_INTERVAL                        (6 * HZ)
@@ -243,6 +244,9 @@ struct abx500_chargalg {
        struct kobject chargalg_kobject;
 };
 
+/*External charger prepare notifier*/
+BLOCKING_NOTIFIER_HEAD(charger_notifier_list);
+
 /* Main battery properties */
 static enum power_supply_property abx500_chargalg_props[] = {
        POWER_SUPPLY_PROP_STATUS,
@@ -503,6 +507,8 @@ static int abx500_chargalg_kick_watchdog(struct abx500_chargalg *di)
 static int abx500_chargalg_ac_en(struct abx500_chargalg *di, int enable,
        int vset, int iset)
 {
+       static int abx500_chargalg_ex_ac_enable_toggle;
+
        if (!di->ac_chg || !di->ac_chg->ops.enable)
                return -ENXIO;
 
@@ -515,6 +521,14 @@ static int abx500_chargalg_ac_en(struct abx500_chargalg *di, int enable,
        di->chg_info.ac_iset = iset;
        di->chg_info.ac_vset = vset;
 
+       /* Enable external charger */
+       if (enable && di->ac_chg->external &&
+           !abx500_chargalg_ex_ac_enable_toggle) {
+               blocking_notifier_call_chain(&charger_notifier_list,
+                                            0, di->dev);
+               abx500_chargalg_ex_ac_enable_toggle++;
+       }
+
        return di->ac_chg->ops.enable(di->ac_chg, enable, vset, iset);
 }
 

diff --git a/drivers/power/pm2301_charger.c b/drivers/power/pm2301_charger.c
index b560fa5ac4e79417f8b07a3c08916b77334365ad..45ef3b9de6b909a2e51ac9987b77571387adc7a0 100644 (file)
--- a/drivers/power/pm2301_charger.c
+++ b/drivers/power/pm2301_charger.c
@@ -1059,6 +1059,13 @@ static int pm2xxx_wall_charger_probe(struct i2c_client *i2c_client,
        ret = pm2xxx_charger_detection(pm2, &val);
 
        if ((ret == 0) && val) {
+               /*
+                * When boot is due to AC charger plug-in,
+                * read interrupt registers
+                */
+               pm2xxx_reg_read(pm2, PM2XXX_REG_INT1, &val);
+               pm2xxx_reg_read(pm2, PM2XXX_REG_INT2, &val);
+               pm2xxx_reg_read(pm2, PM2XXX_REG_INT4, &val);
                pm2->ac.charger_connected = 1;
                pm2->ac_conn = true;
                power_supply_changed(&pm2->ac_chg.psy);

diff --git a/include/linux/mfd/abx500/ux500_chargalg.h b/include/linux/mfd/abx500/ux500_chargalg.h
index 110d12f09548e2083e67a90f8fb30851ba378692..fa831f1e8cf8804e9102bdea2ef3cd3d2e22dfae 100644 (file)
--- a/include/linux/mfd/abx500/ux500_chargalg.h
+++ b/include/linux/mfd/abx500/ux500_chargalg.h
@@ -41,4 +41,6 @@ struct ux500_charger {
        bool external;
 };
 
+extern struct blocking_notifier_head charger_notifier_list;
+
 #endif