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 3/7] power: act8945a_charger: Add status change update support
Date: Fri, 24 Jun 2016 15:17:36 +0800 [thread overview]
Message-ID: <1466752660-2922-4-git-send-email-wenyou.yang@atmel.com> (raw)
In-Reply-To: <1466752660-2922-1-git-send-email-wenyou.yang@atmel.com>
Add the charger status change interrupt support, it will report
the power supply changed event.
This interrupt is generated by one of the conditions as below:
- the state machine jumps out of or into the EOC state
- the CHGIN input voltage goes out of or into the valid range.
- the battery temperature goes out of or into the valid range.
- the PRECHARGE time-out occurs.
- the total charge time-out occurs.
Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
---
drivers/power/act8945a_charger.c | 79 +++++++++++++++++++++++++++++++++++++---
1 file changed, 73 insertions(+), 6 deletions(-)
diff --git a/drivers/power/act8945a_charger.c b/drivers/power/act8945a_charger.c
index 939f1bb..0c61b28 100644
--- a/drivers/power/act8945a_charger.c
+++ b/drivers/power/act8945a_charger.c
@@ -10,6 +10,7 @@
* published by the Free Software Foundation.
*
*/
+#include <linux/interrupt.h>
#include <linux/module.h>
#include <linux/of.h>
#include <linux/of_gpio.h>
@@ -75,7 +76,12 @@ static const char *act8945a_charger_manufacturer = "Active-semi";
#define APCH_STATE_CSTATE_PRE 0x03
struct act8945a_charger {
+ struct power_supply *psy;
struct regmap *regmap;
+ struct work_struct work;
+
+ bool init_done;
+ int irq_pin;
};
static int act8945a_get_charger_state(struct regmap *regmap, int *val)
@@ -252,6 +258,47 @@ static const struct power_supply_desc act8945a_charger_desc = {
.num_properties = ARRAY_SIZE(act8945a_charger_props),
};
+static int act8945a_enable_interrupt(struct act8945a_charger *charger)
+{
+ struct regmap *regmap = charger->regmap;
+ unsigned char ctrl;
+ int ret;
+
+ ctrl = APCH_CTRL_CHGEOCOUT | APCH_CTRL_CHGEOCIN |
+ APCH_CTRL_INDIS | APCH_CTRL_INCON |
+ APCH_CTRL_TEMPOUT | APCH_CTRL_TEMPIN |
+ APCH_CTRL_TIMRPRE | APCH_CTRL_TIMRTOT;
+ ret = regmap_write(regmap, ACT8945A_APCH_CTRL, ctrl);
+ if (ret)
+ return ret;
+
+ ctrl = APCH_STATUS_CHGSTAT | APCH_STATUS_INSTAT |
+ APCH_STATUS_TEMPSTAT | APCH_STATUS_TIMRSTAT;
+ ret = regmap_write(regmap, ACT8945A_APCH_STATUS, ctrl);
+ if (ret)
+ return ret;
+
+ return 0;
+}
+
+static void act8945a_work(struct work_struct *work)
+{
+ struct act8945a_charger *charger =
+ container_of(work, struct act8945a_charger, work);
+
+ power_supply_changed(charger->psy);
+}
+
+static irqreturn_t act8945a_status_changed(int irq, void *dev_id)
+{
+ struct act8945a_charger *charger = dev_id;
+
+ if (charger->init_done)
+ schedule_work(&charger->work);
+
+ return IRQ_HANDLED;
+}
+
#define DEFAULT_TOTAL_TIME_OUT 3
#define DEFAULT_PRE_TIME_OUT 40
#define DEFAULT_INPUT_OVP_THRESHOLD 6600
@@ -267,6 +314,7 @@ static int act8945a_charger_config(struct device *dev,
u32 pre_time_out;
u32 input_voltage_threshold;
int chglev_pin;
+ int ret;
unsigned int tmp;
unsigned int value = 0;
@@ -282,6 +330,18 @@ static int act8945a_charger_config(struct device *dev,
if (tmp & APCH_CFG_SUSCHG)
value |= APCH_CFG_SUSCHG;
+ charger->irq_pin = of_get_named_gpio(np, "active-semi,irq_gpios", 0);
+ if (gpio_is_valid(charger->irq_pin)) {
+ if (!devm_gpio_request(dev, charger->irq_pin, "irq-pin")) {
+ ret = devm_request_irq(dev,
+ gpio_to_irq(charger->irq_pin),
+ act8945a_status_changed,
+ IRQF_TRIGGER_FALLING,
+ "irq-pin", charger);
+ if (ret)
+ dev_dbg(dev, "failed to request nIRQ pin IRQ\n");
+ }
+ }
chglev_pin = of_get_named_gpio_flags(np,
"active-semi,chglev-gpios", 0, &flags);
@@ -359,7 +419,6 @@ static int act8945a_charger_config(struct device *dev,
static int act8945a_charger_probe(struct platform_device *pdev)
{
struct act8945a_charger *charger;
- struct power_supply *psy;
struct power_supply_config psy_cfg = {};
int ret;
@@ -380,14 +439,22 @@ static int act8945a_charger_probe(struct platform_device *pdev)
psy_cfg.of_node = pdev->dev.parent->of_node;
psy_cfg.drv_data = charger;
- psy = devm_power_supply_register(&pdev->dev,
- &act8945a_charger_desc,
- &psy_cfg);
- if (IS_ERR(psy)) {
+ charger->psy = devm_power_supply_register(&pdev->dev,
+ &act8945a_charger_desc,
+ &psy_cfg);
+ if (IS_ERR(charger->psy)) {
dev_err(&pdev->dev, "failed to register power supply\n");
- return PTR_ERR(psy);
+ return PTR_ERR(charger->psy);
}
+ INIT_WORK(&charger->work, act8945a_work);
+
+ ret = act8945a_enable_interrupt(charger);
+ if (ret)
+ return -EIO;
+
+ charger->init_done = true;
+
return 0;
}
--
2.7.4
next prev parent reply other threads:[~2016-06-24 7:29 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 ` Wenyou Yang [this message]
2016-06-24 7:17 ` [PATCH 4/7] power: act8945a_charger: Fix the power supply type Wenyou Yang
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-4-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).