From: Artur Weber <aweber.kernel@gmail.com>
To: Krzysztof Kozlowski <krzk@kernel.org>,
Chanwoo Choi <cw00.choi@samsung.com>
Cc: Sebastian Reichel <sre@kernel.org>, Rob Herring <robh@kernel.org>,
Conor Dooley <conor+dt@kernel.org>, Lee Jones <lee@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Alim Akhtar <alim.akhtar@samsung.com>,
linux-pm@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org,
~postmarketos/upstreaming@lists.sr.ht,
Henrik Grimler <henrik@grimler.se>,
Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>,
Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>,
Artur Weber <aweber.kernel@gmail.com>
Subject: [PATCH RFC 08/11] power: supply: max77693: Add support for detecting and enabling OTG
Date: Thu, 30 May 2024 10:55:58 +0200 [thread overview]
Message-ID: <20240530-max77693-charger-extcon-v1-8-dc2a9e5bdf30@gmail.com> (raw)
In-Reply-To: <20240530-max77693-charger-extcon-v1-0-dc2a9e5bdf30@gmail.com>
Building upon the newly added extcon detection support, add detection
for USB OTG cables (EXTCON_USB_HOST type), and enable/disable the OTG
bits as needed.
Signed-off-by: Artur Weber <aweber.kernel@gmail.com>
---
Downstream also sets "CHGIN output current limit in OTG mode" to 900mA
by writing (1 << 7) to the CHG_CNFG_02 register; while I would try to
add this here, I do not know which exact bits control the current limit
and how their value affects it (downstream has no docs other than what
I just mentioned), so it's impossible for me to know what the mask is.
---
drivers/power/supply/max77693_charger.c | 70 +++++++++++++++++++++++++++------
1 file changed, 59 insertions(+), 11 deletions(-)
diff --git a/drivers/power/supply/max77693_charger.c b/drivers/power/supply/max77693_charger.c
index c2e8ae367381..e548fd420e78 100644
--- a/drivers/power/supply/max77693_charger.c
+++ b/drivers/power/supply/max77693_charger.c
@@ -737,11 +737,41 @@ static int max77693_set_charging(struct max77693_charger *chg, bool enable)
return ret;
}
+static int max77693_set_otg(struct max77693_charger *chg, bool enable)
+{
+ struct regmap *regmap = chg->max77693->regmap;
+ unsigned int data;
+ bool is_enabled;
+ int ret;
+
+ ret = regmap_read(regmap, MAX77693_CHG_REG_CHG_CNFG_00, &data);
+ if (ret)
+ return ret;
+
+ is_enabled = !!(data & CHG_CNFG_00_OTG_MASK);
+
+ if (enable && !is_enabled) {
+ /* OTG on, boost on, DIS_MUIC_CTRL on */
+ data |= CHG_CNFG_00_OTG_MASK | CHG_CNFG_00_BOOST_MASK \
+ | CHG_CNFG_00_DIS_MUIC_CTRL_MASK;
+
+ } else if (!enable && is_enabled) {
+ /* OTG off, boost off, DIS_MUIC_CTRL off */
+ data &= ~(CHG_CNFG_00_OTG_MASK | CHG_CNFG_00_BOOST_MASK \
+ | CHG_CNFG_00_DIS_MUIC_CTRL_MASK);
+ }
+
+ return regmap_write(chg->max77693->regmap,
+ MAX77693_CHG_REG_CHG_CNFG_00,
+ data);
+}
+
static void max77693_charger_extcon_work(struct work_struct *work)
{
struct max77693_charger *chg = container_of(work, struct max77693_charger,
cable.work);
struct extcon_dev *edev = chg->cable.edev;
+ bool set_charging, set_otg;
int connector, state;
int ret;
@@ -760,25 +790,43 @@ static void max77693_charger_extcon_work(struct work_struct *work)
case EXTCON_CHG_USB_FAST:
case EXTCON_CHG_USB_SLOW:
case EXTCON_CHG_USB_PD:
- ret = max77693_set_charging(chg, true);
- if (ret) {
- dev_err(chg->dev, "failed to enable charging\n");
- break;
- }
+ set_charging = true;
+ set_otg = false;
+
dev_info(chg->dev, "charging. connector type: %d\n",
connector);
break;
+ case EXTCON_USB_HOST:
+ set_charging = false;
+ set_otg = true;
+
+ dev_info(chg->dev, "USB host. connector type: %d\n",
+ connector);
+ break;
default:
- ret = max77693_set_charging(chg, false);
- if (ret) {
- dev_err(chg->dev, "failed to disable charging\n");
- break;
- }
- dev_info(chg->dev, "charging. connector type: %d\n",
+ set_charging = false;
+ set_otg = false;
+
+ dev_info(chg->dev, "disconnected. connector type: %d\n",
connector);
break;
}
+ /*
+ * The functions below already check if the change is necessary,
+ * so we don't need to do so here.
+ */
+ ret = max77693_set_charging(chg, set_charging);
+ if (ret) {
+ dev_err(chg->dev, "failed to set charging (%d)\n", ret);
+ goto out;
+ }
+
+ ret = max77693_set_otg(chg, set_otg);
+ if (ret)
+ dev_err(chg->dev, "failed to set OTG (%d)\n", ret);
+
+out:
power_supply_changed(chg->charger);
}
--
2.45.1
next prev parent reply other threads:[~2024-05-30 8:56 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-30 8:55 [PATCH RFC 00/11] power: supply: max77693: Toggle charging/OTG based on extcon status Artur Weber
2024-05-30 8:55 ` [PATCH RFC 01/11] dt-bindings: power: supply: max77693: Add fast charge current property Artur Weber
2024-05-31 9:35 ` Krzysztof Kozlowski
2024-05-30 8:55 ` [PATCH RFC 02/11] dt-bindings: power: supply: max77693: Add maxim,usb-connector property Artur Weber
2024-05-31 9:15 ` Krzysztof Kozlowski
2024-05-30 8:55 ` [PATCH RFC 03/11] mfd: max77693: Add defines for charger current control Artur Weber
2024-05-31 9:14 ` Krzysztof Kozlowski
2024-05-30 8:55 ` [PATCH RFC 04/11] mfd: max77693: Add defines for OTG control Artur Weber
2024-05-31 9:36 ` Krzysztof Kozlowski
2024-05-30 8:55 ` [PATCH RFC 05/11] power: supply: max77693: Expose INPUT_CURRENT_LIMIT and CURRENT_MAX Artur Weber
2024-05-31 9:38 ` Krzysztof Kozlowski
2024-05-31 12:22 ` Artur Weber
2024-05-30 8:55 ` [PATCH RFC 06/11] power: supply: max77693: Set charge current limits during init Artur Weber
2024-05-31 9:47 ` Krzysztof Kozlowski
2024-05-31 11:55 ` Artur Weber
2024-05-31 12:18 ` Krzysztof Kozlowski
2024-06-05 14:43 ` Artur Weber
2024-05-30 8:55 ` [PATCH RFC 07/11] power: supply: max77693: Add USB extcon detection for enabling charging Artur Weber
2024-05-30 8:55 ` Artur Weber [this message]
2024-05-30 8:55 ` [PATCH RFC 09/11] power: supply: max77693: Set up charge/input current according to cable type Artur Weber
2024-05-30 8:56 ` [PATCH RFC 10/11] ARM: dts: samsung: exynos4212-tab3: Set fast charge current for MAX77693 Artur Weber
2024-05-30 8:56 ` [PATCH RFC 11/11] ARM: dts: samsung: exynos4212-tab3: Add USB connector node Artur Weber
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=20240530-max77693-charger-extcon-v1-8-dc2a9e5bdf30@gmail.com \
--to=aweber.kernel@gmail.com \
--cc=GNUtoo@cyberdimension.org \
--cc=alim.akhtar@samsung.com \
--cc=conor+dt@kernel.org \
--cc=cw00.choi@samsung.com \
--cc=devicetree@vger.kernel.org \
--cc=henrik@grimler.se \
--cc=krzk+dt@kernel.org \
--cc=krzk@kernel.org \
--cc=lee@kernel.org \
--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=robh@kernel.org \
--cc=sre@kernel.org \
--cc=wolfgit@wiedmeyer.de \
--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