From: Timon Baetz <timon.baetz@protonmail.com>
To: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>, Rob Herring <robh+dt@kernel.org>,
MyungJoo Ham <myungjoo.ham@samsung.com>,
Chanwoo Choi <cw00.choi@samsung.com>,
Lee Jones <lee.jones@linaro.org>,
Sebastian Reichel <sre@kernel.org>,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org, linux-pm@vger.kernel.org,
~postmarketos/upstreaming@lists.sr.ht,
Timon Baetz <timon.baetz@protonmail.com>
Subject: [PATCH v6 3/8] power: supply: max8997_charger: Set CHARGER current limit
Date: Wed, 30 Dec 2020 20:52:15 +0000 [thread overview]
Message-ID: <20201230205139.1812366-3-timon.baetz@protonmail.com> (raw)
In-Reply-To: <20201230205139.1812366-1-timon.baetz@protonmail.com>
Register for extcon notification and set charging current depending on
the detected cable type. Current values are taken from vendor kernel,
where most charger types end up setting 650mA [0].
Also enable and disable the CHARGER regulator based on extcon events.
[0] https://github.com/krzk/linux-vendor-backup/blob/samsung/galaxy-s2-epic-4g-touch-sph-d710-exynos4210-dump/drivers/misc/max8997-muic.c#L1675-L1678
Signed-off-by: Timon Baetz <timon.baetz@protonmail.com>
---
v6: dev_info() instead of dev_err().
v5: Use devm_regulator_get_optional(), dev_err() on failure.
dev_err() on extcon_get_edev_by_phandle() failure.
v4: Make extcon and charger-supply optional.
v3: Split MFD change.
return on regulator_set_current_limit() failure.
v2: Split DTS changes.
Add missing include.
Rename charger_data members.
Disable regulator on regulator_set_current_limit() failure.
Fix ret declaration.
Remove unneeded variables.
Don't dev_err() on deferral.
Get regulator and extcon from DTS.
Use devm_regulator_get().
Fix indentation.
drivers/power/supply/max8997_charger.c | 96 ++++++++++++++++++++++++++
1 file changed, 96 insertions(+)
diff --git a/drivers/power/supply/max8997_charger.c b/drivers/power/supply/max8997_charger.c
index 1947af25879a..23df91ed2c72 100644
--- a/drivers/power/supply/max8997_charger.c
+++ b/drivers/power/supply/max8997_charger.c
@@ -6,12 +6,14 @@
// MyungJoo Ham <myungjoo.ham@samsung.com>
#include <linux/err.h>
+#include <linux/extcon.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/platform_device.h>
#include <linux/power_supply.h>
#include <linux/mfd/max8997.h>
#include <linux/mfd/max8997-private.h>
+#include <linux/regulator/consumer.h>
/* MAX8997_REG_STATUS4 */
#define DCINOK_SHIFT 1
@@ -31,6 +33,10 @@ struct charger_data {
struct device *dev;
struct max8997_dev *iodev;
struct power_supply *battery;
+ struct regulator *reg;
+ struct extcon_dev *edev;
+ struct notifier_block extcon_nb;
+ struct work_struct extcon_work;
};
static enum power_supply_property max8997_battery_props[] = {
@@ -88,6 +94,67 @@ static int max8997_battery_get_property(struct power_supply *psy,
return 0;
}
+static void max8997_battery_extcon_evt_stop_work(void *data)
+{
+ struct charger_data *charger = data;
+
+ cancel_work_sync(&charger->extcon_work);
+}
+
+static void max8997_battery_extcon_evt_worker(struct work_struct *work)
+{
+ struct charger_data *charger =
+ container_of(work, struct charger_data, extcon_work);
+ struct extcon_dev *edev = charger->edev;
+ int current_limit;
+
+ if (extcon_get_state(edev, EXTCON_CHG_USB_SDP) > 0) {
+ dev_dbg(charger->dev, "USB SDP charger is connected\n");
+ current_limit = 450000;
+ } else if (extcon_get_state(edev, EXTCON_CHG_USB_DCP) > 0) {
+ dev_dbg(charger->dev, "USB DCP charger is connected\n");
+ current_limit = 650000;
+ } else if (extcon_get_state(edev, EXTCON_CHG_USB_FAST) > 0) {
+ dev_dbg(charger->dev, "USB FAST charger is connected\n");
+ current_limit = 650000;
+ } else if (extcon_get_state(edev, EXTCON_CHG_USB_SLOW) > 0) {
+ dev_dbg(charger->dev, "USB SLOW charger is connected\n");
+ current_limit = 650000;
+ } else if (extcon_get_state(edev, EXTCON_CHG_USB_CDP) > 0) {
+ dev_dbg(charger->dev, "USB CDP charger is connected\n");
+ current_limit = 650000;
+ } else {
+ dev_dbg(charger->dev, "USB charger is diconnected\n");
+ current_limit = -1;
+ }
+
+ if (current_limit > 0) {
+ int ret = regulator_set_current_limit(charger->reg, current_limit, current_limit);
+
+ if (ret) {
+ dev_err(charger->dev, "failed to set current limit: %d\n", ret);
+ return;
+ }
+ ret = regulator_enable(charger->reg);
+ if (ret)
+ dev_err(charger->dev, "failed to enable regulator: %d\n", ret);
+ } else {
+ int ret = regulator_disable(charger->reg);
+
+ if (ret)
+ dev_err(charger->dev, "failed to disable regulator: %d\n", ret);
+ }
+}
+
+static int max8997_battery_extcon_evt(struct notifier_block *nb,
+ unsigned long event, void *param)
+{
+ struct charger_data *charger =
+ container_of(nb, struct charger_data, extcon_nb);
+ schedule_work(&charger->extcon_work);
+ return NOTIFY_OK;
+}
+
static const struct power_supply_desc max8997_battery_desc = {
.name = "max8997_pmic",
.type = POWER_SUPPLY_TYPE_BATTERY,
@@ -170,6 +237,35 @@ static int max8997_battery_probe(struct platform_device *pdev)
return PTR_ERR(charger->battery);
}
+ charger->reg = devm_regulator_get_optional(&pdev->dev, "charger");
+ if (IS_ERR(charger->reg)) {
+ if (PTR_ERR(charger->reg) == -EPROBE_DEFER)
+ return -EPROBE_DEFER;
+ dev_info(&pdev->dev, "couldn't get charger regulator\n");
+ }
+ charger->edev = extcon_get_edev_by_phandle(&pdev->dev, 0);
+ if (IS_ERR(charger->edev)) {
+ if (PTR_ERR(charger->edev) == -EPROBE_DEFER)
+ return -EPROBE_DEFER;
+ dev_info(charger->dev, "couldn't get extcon device\n");
+ }
+
+ if (!IS_ERR(charger->reg) && !IS_ERR(charger->edev)) {
+ INIT_WORK(&charger->extcon_work, max8997_battery_extcon_evt_worker);
+ ret = devm_add_action(&pdev->dev, max8997_battery_extcon_evt_stop_work, charger);
+ if (ret) {
+ dev_err(&pdev->dev, "failed to add extcon evt stop action: %d\n", ret);
+ return ret;
+ }
+ charger->extcon_nb.notifier_call = max8997_battery_extcon_evt;
+ ret = devm_extcon_register_notifier_all(&pdev->dev, charger->edev,
+ &charger->extcon_nb);
+ if (ret) {
+ dev_err(&pdev->dev, "failed to register extcon notifier\n");
+ return ret;
+ };
+ }
+
return 0;
}
--
2.25.1
next prev parent reply other threads:[~2020-12-30 20:53 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-30 20:51 [PATCH v6 1/8] extcon: max8997: Add CHGINS and CHGRM interrupt handling Timon Baetz
2020-12-30 20:52 ` [PATCH v6 2/8] regulator: dt-bindings: Document max8997-pmic nodes Timon Baetz
2021-01-04 13:51 ` Mark Brown
2021-01-04 18:18 ` Krzysztof Kozlowski
2021-01-04 18:27 ` Mark Brown
2021-01-04 18:38 ` Krzysztof Kozlowski
2021-01-04 21:24 ` Mark Brown
2021-01-05 16:55 ` Krzysztof Kozlowski
2021-01-06 14:59 ` Mark Brown
2021-01-08 15:16 ` Timon Baetz
2021-01-08 16:16 ` Mark Brown
2021-01-15 6:19 ` Timon Baetz
2021-01-15 13:42 ` Mark Brown
2021-01-16 8:03 ` Timon Baetz
2021-01-18 12:45 ` Mark Brown
2021-01-11 21:50 ` Rob Herring
2020-12-30 20:52 ` Timon Baetz [this message]
2020-12-30 23:22 ` [PATCH v6 3/8] power: supply: max8997_charger: Set CHARGER current limit kernel test robot
2020-12-31 7:19 ` Timon Baetz
2020-12-31 8:23 ` Krzysztof Kozlowski
2020-12-31 8:55 ` Krzysztof Kozlowski
2021-01-03 1:53 ` Sebastian Reichel
2020-12-30 20:52 ` [PATCH v6 4/8] ARM: dts: exynos: Add muic and charger nodes for I9100 Timon Baetz
2020-12-30 20:52 ` [PATCH v6 5/8] ARM: dts: exynos: Add muic and charger nodes for Origen Timon Baetz
2020-12-30 20:52 ` [PATCH v6 6/8] ARM: dts: exynos: Add muic and charger nodes for Trats Timon Baetz
2020-12-30 20:53 ` [PATCH v6 7/8] ARM: dts: exynos: Fix charging regulator voltage and current for I9100 Timon Baetz
2020-12-30 20:53 ` [PATCH v6 8/8] ARM: dts: exynos: Add top-off charging regulator node " Timon Baetz
2021-01-03 16:32 ` (subset) [PATCH v6 1/8] extcon: max8997: Add CHGINS and CHGRM interrupt handling Krzysztof Kozlowski
2021-01-03 16:34 ` Krzysztof Kozlowski
2021-01-04 10:26 ` Chanwoo Choi
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=20201230205139.1812366-3-timon.baetz@protonmail.com \
--to=timon.baetz@protonmail.com \
--cc=broonie@kernel.org \
--cc=cw00.choi@samsung.com \
--cc=devicetree@vger.kernel.org \
--cc=krzk@kernel.org \
--cc=lee.jones@linaro.org \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=myungjoo.ham@samsung.com \
--cc=robh+dt@kernel.org \
--cc=sre@kernel.org \
--cc=~postmarketos/upstreaming@lists.sr.ht \
/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).