From: Wenyou Yang <wenyou.yang@atmel.com>
To: Sebastian Reichel <sre@kernel.org>,
Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>,
David Woodhouse <dwmw2@infradead.org>,
Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>,
Mark Brown <broonie@kernel.org>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
"Kumar Gala" <galak@codeaurora.org>
Cc: <linux-kernel@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
Nicolas Ferre <nicolas.ferre@atmel.com>,
<linux-pm@vger.kernel.org>, Wenyou Yang <wenyou.yang@atmel.com>
Subject: [PATCH 4/7] power: act8945a_charger: Fix the power supply type
Date: Fri, 24 Jun 2016 15:17:37 +0800 [thread overview]
Message-ID: <1466752660-2922-5-git-send-email-wenyou.yang@atmel.com> (raw)
In-Reply-To: <1466752660-2922-1-git-send-email-wenyou.yang@atmel.com>
The power supply type property is varying as the external power
supply changes. It is not a constant.
Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
---
drivers/power/act8945a_charger.c | 48 ++++++++++++++++++++++++++++++++--------
1 file changed, 39 insertions(+), 9 deletions(-)
diff --git a/drivers/power/act8945a_charger.c b/drivers/power/act8945a_charger.c
index 0c61b28..be65e5d 100644
--- a/drivers/power/act8945a_charger.c
+++ b/drivers/power/act8945a_charger.c
@@ -77,6 +77,7 @@ static const char *act8945a_charger_manufacturer = "Active-semi";
struct act8945a_charger {
struct power_supply *psy;
+ struct power_supply_desc desc;
struct regmap *regmap;
struct work_struct work;
@@ -250,14 +251,6 @@ static int act8945a_charger_get_property(struct power_supply *psy,
return ret;
}
-static const struct power_supply_desc act8945a_charger_desc = {
- .name = "act8945a-charger",
- .type = POWER_SUPPLY_TYPE_BATTERY,
- .get_property = act8945a_charger_get_property,
- .properties = act8945a_charger_props,
- .num_properties = ARRAY_SIZE(act8945a_charger_props),
-};
-
static int act8945a_enable_interrupt(struct act8945a_charger *charger)
{
struct regmap *regmap = charger->regmap;
@@ -281,11 +274,39 @@ static int act8945a_enable_interrupt(struct act8945a_charger *charger)
return 0;
}
+static unsigned int act8945a_set_supply_type(struct act8945a_charger *charger,
+ unsigned int *type)
+{
+ unsigned int status, state;
+ int ret;
+
+ ret = regmap_read(charger->regmap, ACT8945A_APCH_STATUS, &status);
+ if (ret < 0)
+ return ret;
+
+ ret = regmap_read(charger->regmap, ACT8945A_APCH_STATE, &state);
+ if (ret < 0)
+ return ret;
+
+ if (status & APCH_STATUS_INDAT) {
+ if (state & APCH_STATE_ACINSTAT)
+ *type = POWER_SUPPLY_TYPE_MAINS;
+ else
+ *type = POWER_SUPPLY_TYPE_USB;
+ } else {
+ *type = POWER_SUPPLY_TYPE_BATTERY;
+ }
+
+ return 0;
+}
+
static void act8945a_work(struct work_struct *work)
{
struct act8945a_charger *charger =
container_of(work, struct act8945a_charger, work);
+ act8945a_set_supply_type(charger, &charger->desc.type);
+
power_supply_changed(charger->psy);
}
@@ -436,11 +457,20 @@ static int act8945a_charger_probe(struct platform_device *pdev)
if (ret)
return ret;
+ charger->desc.name = "act8945a-charger";
+ charger->desc.get_property = act8945a_charger_get_property;
+ charger->desc.properties = act8945a_charger_props;
+ charger->desc.num_properties = ARRAY_SIZE(act8945a_charger_props);
+
+ ret = act8945a_set_supply_type(charger, &charger->desc.type);
+ if (ret)
+ return -EINVAL;
+
psy_cfg.of_node = pdev->dev.parent->of_node;
psy_cfg.drv_data = charger;
charger->psy = devm_power_supply_register(&pdev->dev,
- &act8945a_charger_desc,
+ &charger->desc,
&psy_cfg);
if (IS_ERR(charger->psy)) {
dev_err(&pdev->dev, "failed to register power supply\n");
--
2.7.4
next prev parent reply other threads:[~2016-06-24 7:30 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-24 7:17 [PATCH 0/7] power: act8945a_charger: Improvements Wenyou Yang
2016-06-24 7:17 ` [PATCH 1/7] power: act8945a_charger: Remove "battery_temperature" Wenyou Yang
2016-06-24 7:17 ` [PATCH 2/7] power: act8945a_charger: Improve Wenyou Yang
2016-06-24 11:22 ` kbuild test robot
2016-06-24 12:43 ` kbuild test robot
2016-06-24 12:43 ` [PATCH] power: act8945a_charger: fix semicolon.cocci warnings kbuild test robot
2016-06-28 1:34 ` Yang, Wenyou
2016-07-29 0:57 ` Yang, Wenyou
2016-07-29 1:01 ` [kbuild-all] " Fengguang Wu
2016-06-24 7:17 ` [PATCH 3/7] power: act8945a_charger: Add status change update support Wenyou Yang
2016-06-24 7:17 ` Wenyou Yang [this message]
2016-06-24 7:17 ` [PATCH 5/7] power: act8945a_charger: Add capacity level property Wenyou Yang
2016-06-24 7:17 ` [PATCH 6/7] power: act8945a_charger: Add max current property Wenyou Yang
2016-06-24 7:17 ` [PATCH 7/7] doc: bindings: act8945a-charger: Update properties Wenyou Yang
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=1466752660-2922-5-git-send-email-wenyou.yang@atmel.com \
--to=wenyou.yang@atmel.com \
--cc=broonie@kernel.org \
--cc=dbaryshkov@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=dwmw2@infradead.org \
--cc=galak@codeaurora.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=nicolas.ferre@atmel.com \
--cc=pawel.moll@arm.com \
--cc=robh+dt@kernel.org \
--cc=sre@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).