From: Mathieu Poirier <mathieu.poirier@linaro.org>
To: Anton Vorontsov <anton.vorontsov@linaro.org>
Cc: linux-kernel@vger.kernel.org, dwmw2@infradead.org
Subject: Re: [PATCH 38/57] power: l9540: Charge only mode fixes
Date: Fri, 28 Sep 2012 12:32:36 -0600 [thread overview]
Message-ID: <5065ED44.6090302@linaro.org> (raw)
In-Reply-To: <20120928002749.GC20560@lizard>
On 12-09-27 06:27 PM, Anton Vorontsov wrote:
> On Tue, Sep 25, 2012 at 10:12:35AM -0600, mathieu.poirier@linaro.org wrote:
>> From: Rupesh Kumar <rupesh.kumar@stericsson.com>
>>
>> Fix for: charging not getting enabled in
>> charge only mode by external charger.
>
> Subject says l9540.. what is this?
>
>> Signed-off-by: Rupesh Kumar <rupesh.kumar@stericsson.com>
>> Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
>> Reviewed-by: Marcus COOPER <marcus.xm.cooper@stericsson.com>
>> Reviewed-by: Michel JAOUEN <michel.jaouen@stericsson.com>
>> Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
>> Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
>> ---
>> drivers/power/ab8500_charger.c | 42 +++++++++++++++++++++++++++++
>> drivers/power/abx500_chargalg.c | 14 +++++++++
>> include/linux/mfd/abx500/ux500_chargalg.h | 2 +
>> 3 files changed, 58 insertions(+), 0 deletions(-)
>>
>> diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c
>> index 70e7c5e..ebeb068 100644
>> --- 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>
>> @@ -94,6 +95,10 @@
>> #define AB8500_SW_CONTROL_FALLBACK 0x03
>> /* Wait for enumeration before charging 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 {
>> @@ -1672,6 +1677,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;
>
> Need an empty line here.
>
>> + /*Toggle External charger control pin*/
>
> Spaces after /* and before */.
>
>> + 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;
>
> No need for goto.
>
>> + }
>> + 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
>> @@ -3201,6 +3229,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 __devexit ab8500_charger_remove(struct platform_device *pdev)
>> {
>> struct ab8500_charger *di = platform_get_drvdata(pdev);
>> @@ -3233,6 +3265,11 @@ static int __devexit ab8500_charger_remove(struct platform_device *pdev)
>> /* Delete the work queue */
>> destroy_workqueue(di->charger_wq);
>>
>> + /*Unregister external charger enable notifier*/
>
> Spaces.
>
>> + 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);
>> @@ -3307,6 +3344,11 @@ static int __devinit ab8500_charger_probe(struct platform_device *pdev)
>> di->ac_chg.enabled = di->pdata->ac_enabled;
>> di->ac_chg.external = false;
>>
>> + /*notifier for external charger enabling*/
>
> Spaces.
>
>> + 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 9568f63..3ca00dd 100644
>> --- a/drivers/power/abx500_chargalg.c
>> +++ b/drivers/power/abx500_chargalg.c
>> @@ -24,6 +24,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)
>> @@ -255,6 +256,9 @@ static enum power_supply_property abx500_chargalg_props[] = {
>> POWER_SUPPLY_PROP_HEALTH,
>> };
>>
>> +/*External charger prepare notifier*/
>> +BLOCKING_NOTIFIER_HEAD(charger_notifier_list);
>
> Can you place the notifier list in di->? Oh, you can't, di is
> something different for registrat
>
> struct abx500_chargalg *di;
> struct ab8500_charger *di;
>
> But having the global list is not friendly to multi-device situations.
>
> If there's a subtle reason why you do it this way, it have to be described
> in the patch description (which is very scarce, btw).
Though I did not write this code, it looks to me like any other global
variable. Perhaps you can suggest another way to write this ?
>
> Also, the charger_notifier_list name is in global name space, it's too
> generic. Has to be ab8500_chg_notifier_list or something.
Ok, will fix.
>
>> /**
>> * abx500_chargalg_safety_timer_expired() - Expiration of the safety timer
>> * @data: pointer to the abx500_chargalg structure
>> @@ -508,6 +512,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 ab8500_chargalg_ex_ac_enable_toggle;
>
> Static? No, this is not multi-device friendly, seems like a hack.
>
>> +
>> if (!di->ac_chg || !di->ac_chg->ops.enable)
>> return -ENXIO;
>>
>> @@ -520,6 +526,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*/
>
> spaces.
>
>> + if (enable && di->ac_chg->external &&
>> + !ab8500_chargalg_ex_ac_enable_toggle) {
>
> Wrong indentation.
>
>> + blocking_notifier_call_chain(&charger_notifier_list,
>> + 0, di->dev);
>> + ab8500_chargalg_ex_ac_enable_toggle++;
>> + }
>> +
>> return di->ac_chg->ops.enable(di->ac_chg, enable, vset, iset);
>> }
>>
>> diff --git a/include/linux/mfd/abx500/ux500_chargalg.h b/include/linux/mfd/abx500/ux500_chargalg.h
>> index 110d12f..fa831f1 100644
>> --- 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
>> --
>> 1.7.5.4
next prev parent reply other threads:[~2012-09-28 18:32 UTC|newest]
Thread overview: 108+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-25 16:11 [PATCH 00/57] power: Upgrade to ux500 battery management driver mathieu.poirier
2012-09-25 16:11 ` [PATCH 01/57] power: ab8500_bm: Charger current step-up/down mathieu.poirier
2012-09-28 3:41 ` Anton Vorontsov
2012-09-25 16:11 ` [PATCH 02/57] power: ab8500_bm: Don't clear the CCMuxOffset bit mathieu.poirier
2012-09-28 3:42 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 03/57] power: ab8500_btemp: Detect battery type in workqueue mathieu.poirier
2012-09-25 16:12 ` [PATCH 04/57] power: ab8500: bm: movimg back to ab8500 platform data managment mathieu.poirier
2012-09-27 2:42 ` Anton Vorontsov
2012-09-27 2:53 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 05/57] power: ab8500_bm: Rename the power_loss function mathieu.poirier
2012-09-25 16:12 ` [PATCH 06/57] power: ab8500_bm: Skip first CCEOC irq for instant current mathieu.poirier
2012-09-25 16:12 ` [PATCH 07/57] power: ab8500_bm: Detect removed charger mathieu.poirier
2012-09-27 3:09 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 08/57] power: ab8500_fg: flush sync on suspend mathieu.poirier
2012-09-27 3:11 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 09/57] power: ab8500_fg: usleep_range instead of short msleep mathieu.poirier
2012-09-27 2:36 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 10/57] power: ab8500_charger: Handle gpadc errors mathieu.poirier
2012-09-25 16:12 ` [PATCH 11/57] power: Recharge condition not optimal for battery mathieu.poirier
2012-09-27 3:29 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 12/57] power: ab8500_fg: balance IRQ enable mathieu.poirier
2012-09-25 16:12 ` [PATCH 13/57] power: ab8500_bm: Ignore false btemp low interrupt mathieu.poirier
2012-09-27 3:32 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 14/57] power: Adds support for Car/Travel Adapters mathieu.poirier
2012-09-25 16:12 ` [PATCH 15/57] power: ab8500_fg: Round capacity output mathieu.poirier
2012-09-25 16:12 ` [PATCH 16/57] power: bm remove superfluous BTEMP thermal comp mathieu.poirier
2012-09-25 16:12 ` [PATCH 17/57] power: ab8500_bm: Added support for BATT_OVV mathieu.poirier
2012-09-27 3:36 ` Anton Vorontsov
2012-09-28 18:24 ` Mathieu Poirier
2012-09-28 18:26 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 18/57] power: Add sysfs interfaces for capacity mathieu.poirier
2012-09-27 7:08 ` Anton Vorontsov
2012-09-28 18:26 ` Mathieu Poirier
2012-09-28 19:11 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 19/57] power: remove unused defines mathieu.poirier
2012-09-25 16:12 ` [PATCH 20/57] power: Adds support for legacy USB chargers mathieu.poirier
2012-09-27 7:15 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 21/57] power: Overflow in current calculation mathieu.poirier
2012-09-25 16:12 ` [PATCH 22/57] power: AB workaround for invalid charger mathieu.poirier
2012-09-25 16:12 ` [PATCH 23/57] power: Add plaform data charger configurables mathieu.poirier
2012-09-25 16:12 ` [PATCH 24/57] power: ab8500_fg: Adjust for RF bursts voltage drops mathieu.poirier
2012-09-25 16:12 ` [PATCH 25/57] power: ab8500: adaptation to ab version mathieu.poirier
2012-09-25 16:12 ` [PATCH 26/57] power: charge: update watchdog for pm2xxx support mathieu.poirier
2012-09-25 16:12 ` [PATCH 27/57] power: sysfs interface update mathieu.poirier
2012-09-27 7:20 ` Anton Vorontsov
2012-09-28 18:26 ` Mathieu Poirier
2012-09-25 16:12 ` [PATCH 28/57] power: ab8500 - Accessing Autopower register fails mathieu.poirier
2012-09-25 16:12 ` [PATCH 29/57] power: ab8500_fg: Goto INIT_RECOVERY when charger removed mathieu.poirier
2012-09-25 16:12 ` [PATCH 30/57] power: ab8500: Flush & sync all works mathieu.poirier
2012-09-27 7:23 ` Anton Vorontsov
2012-09-28 18:28 ` Mathieu Poirier
2012-09-28 19:54 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 31/57] power: ab8500_fg: fix to use correct battery charge full design mathieu.poirier
2012-09-27 7:27 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 32/57] power: ab8500_charger: Do not touch VBUSOVV bits mathieu.poirier
2012-09-25 16:12 ` [PATCH 33/57] power: u8500_charger: Delay for USB enumeration mathieu.poirier
2012-09-27 7:42 ` Anton Vorontsov
2012-09-28 16:56 ` Mathieu Poirier
2012-09-28 17:09 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 34/57] power: ab8500_fg: add power cut feature for ab8505 mathieu.poirier
2012-09-28 0:01 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 35/57] power: ab8500_fg: Report unscaled capacity mathieu.poirier
2012-09-25 16:12 ` [PATCH 36/57] power: add backup battery charge voltages mathieu.poirier
2012-09-25 16:12 ` [PATCH 37/57] power: ab8500_bm: Quick re-attach charging behaviour mathieu.poirier
2012-09-28 0:13 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 38/57] power: l9540: Charge only mode fixes mathieu.poirier
2012-09-28 0:27 ` Anton Vorontsov
2012-09-28 18:32 ` Mathieu Poirier [this message]
2012-09-25 16:12 ` [PATCH 39/57] power: ab8500_charger: Prevent auto drop of VBUS mathieu.poirier
2012-09-28 0:52 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 40/57] power: ab8500: ADC for battery thermistor mathieu.poirier
2012-09-28 0:57 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 41/57] power: ab8500_btemp: Filter btemp readings mathieu.poirier
2012-09-25 16:12 ` [PATCH 42/57] power: charging: Allow capacity to raise from 1% mathieu.poirier
2012-09-25 16:12 ` [PATCH 43/57] power: charging: Add AB8505_USB_LINK_STATUS mathieu.poirier
2012-09-25 16:12 ` [PATCH 44/57] power: ab8500: remove unecesary define flag mathieu.poirier
2012-09-28 1:05 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 45/57] power: ab8500: defer btemp filtering while init mathieu.poirier
2012-09-28 1:08 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 46/57] power: chargealg: Realign with upstream version mathieu.poirier
2012-09-28 1:17 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 47/57] power: Harmonising platform data declaration/handling mathieu.poirier
2012-09-28 1:11 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 48/57] power: ab8500 : quick re-attach for ext charger mathieu.poirier
2012-09-28 1:19 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 49/57] power: Cancelling status charging notification mathieu.poirier
2012-09-28 2:16 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 50/57] power: ab8500-chargalg: update battery health on safety timer exp mathieu.poirier
2012-09-28 2:21 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 51/57] power: ab8500: Re-alignment with internal developement mathieu.poirier
2012-09-28 2:35 ` Anton Vorontsov
2012-09-28 2:45 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 52/57] power: abx500_chargalg: Use hrtimer mathieu.poirier
2012-09-28 2:47 ` Anton Vorontsov
2012-09-28 18:33 ` Mathieu Poirier
2012-09-28 19:41 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 53/57] power: ab8500_fg: Moving structure definitions to header file mathieu.poirier
2012-09-28 2:51 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 54/57] power: ab8500_charger: Use USBLink1Status Register mathieu.poirier
2012-09-28 2:56 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 55/57] power: ab8500_charger: Add UsbLineCtrl2 reference mathieu.poirier
2012-09-28 2:58 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 56/57] power: abx500_chargalg: Fix quick re-attach charger issue mathieu.poirier
2012-09-28 3:00 ` Anton Vorontsov
2012-09-25 16:12 ` [PATCH 57/57] power: ab8500_charger: Limit USB charger current mathieu.poirier
2012-09-27 3:38 ` [PATCH 00/57] power: Upgrade to ux500 battery management driver Anton Vorontsov
2012-09-27 22:08 ` Mathieu Poirier
2012-09-28 0:36 ` Anton Vorontsov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5065ED44.6090302@linaro.org \
--to=mathieu.poirier@linaro.org \
--cc=anton.vorontsov@linaro.org \
--cc=dwmw2@infradead.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).