From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9A9D2C433E9 for ; Wed, 30 Dec 2020 20:53:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 73EC6212CC for ; Wed, 30 Dec 2020 20:53:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726550AbgL3UxB (ORCPT ); Wed, 30 Dec 2020 15:53:01 -0500 Received: from mail2.protonmail.ch ([185.70.40.22]:56286 "EHLO mail2.protonmail.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726525AbgL3UxA (ORCPT ); Wed, 30 Dec 2020 15:53:00 -0500 Date: Wed, 30 Dec 2020 20:52:15 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1609361537; bh=UxHJgzvxLBvgzIBtDDuqwhFJdVNTbPAqh4otZLsJ9dk=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=hkRAFSrlGTbmMgk/e1mAV1wImgUVq8I7SiB8CQFJNJlvi/o7lPBCfRhu7hSrU0IfF ujVbJmRnpUPI29nHaSHGkUVZsdVELM6UpuOSU/O1562S04KV1HgaE3dIuJkUJUjilb rBsR7JP4JtZg5ileV+GWwODsjKGV1gurdOiFoCw4= To: Krzysztof Kozlowski From: Timon Baetz Cc: Marek Szyprowski , Liam Girdwood , Mark Brown , Rob Herring , MyungJoo Ham , Chanwoo Choi , Lee Jones , Sebastian Reichel , 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 Reply-To: Timon Baetz Subject: [PATCH v6 3/8] power: supply: max8997_charger: Set CHARGER current limit Message-ID: <20201230205139.1812366-3-timon.baetz@protonmail.com> In-Reply-To: <20201230205139.1812366-1-timon.baetz@protonmail.com> References: <20201230205139.1812366-1-timon.baetz@protonmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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().=20 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 =20 #include +#include #include #include #include #include #include #include +#include =20 /* MAX8997_REG_STATUS4 */ #define DCINOK_SHIFT=09=091 @@ -31,6 +33,10 @@ struct charger_data { =09struct device *dev; =09struct max8997_dev *iodev; =09struct power_supply *battery; +=09struct regulator *reg; +=09struct extcon_dev *edev; +=09struct notifier_block extcon_nb; +=09struct work_struct extcon_work; }; =20 static enum power_supply_property max8997_battery_props[] =3D { @@ -88,6 +94,67 @@ static int max8997_battery_get_property(struct power_sup= ply *psy, =09return 0; } =20 +static void max8997_battery_extcon_evt_stop_work(void *data) +{ +=09struct charger_data *charger =3D data; + +=09cancel_work_sync(&charger->extcon_work); +} + +static void max8997_battery_extcon_evt_worker(struct work_struct *work) +{ +=09struct charger_data *charger =3D +=09 container_of(work, struct charger_data, extcon_work); +=09struct extcon_dev *edev =3D charger->edev; +=09int current_limit; + +=09if (extcon_get_state(edev, EXTCON_CHG_USB_SDP) > 0) { +=09=09dev_dbg(charger->dev, "USB SDP charger is connected\n"); +=09=09current_limit =3D 450000; +=09} else if (extcon_get_state(edev, EXTCON_CHG_USB_DCP) > 0) { +=09=09dev_dbg(charger->dev, "USB DCP charger is connected\n"); +=09=09current_limit =3D 650000; +=09} else if (extcon_get_state(edev, EXTCON_CHG_USB_FAST) > 0) { +=09=09dev_dbg(charger->dev, "USB FAST charger is connected\n"); +=09=09current_limit =3D 650000; +=09} else if (extcon_get_state(edev, EXTCON_CHG_USB_SLOW) > 0) { +=09=09dev_dbg(charger->dev, "USB SLOW charger is connected\n"); +=09=09current_limit =3D 650000; +=09} else if (extcon_get_state(edev, EXTCON_CHG_USB_CDP) > 0) { +=09=09dev_dbg(charger->dev, "USB CDP charger is connected\n"); +=09=09current_limit =3D 650000; +=09} else { +=09=09dev_dbg(charger->dev, "USB charger is diconnected\n"); +=09=09current_limit =3D -1; +=09} + +=09if (current_limit > 0) { +=09=09int ret =3D regulator_set_current_limit(charger->reg, current_limit,= current_limit); + +=09=09if (ret) { +=09=09=09dev_err(charger->dev, "failed to set current limit: %d\n", ret); +=09=09=09return; +=09=09} +=09=09ret =3D regulator_enable(charger->reg); +=09=09if (ret) +=09=09=09dev_err(charger->dev, "failed to enable regulator: %d\n", ret); +=09} else { +=09=09int ret =3D regulator_disable(charger->reg); + +=09=09if (ret) +=09=09=09dev_err(charger->dev, "failed to disable regulator: %d\n", ret); +=09} +} + +static int max8997_battery_extcon_evt(struct notifier_block *nb, +=09=09=09=09unsigned long event, void *param) +{ +=09struct charger_data *charger =3D +=09=09container_of(nb, struct charger_data, extcon_nb); +=09schedule_work(&charger->extcon_work); +=09return NOTIFY_OK; +} + static const struct power_supply_desc max8997_battery_desc =3D { =09.name=09=09=3D "max8997_pmic", =09.type=09=09=3D POWER_SUPPLY_TYPE_BATTERY, @@ -170,6 +237,35 @@ static int max8997_battery_probe(struct platform_devic= e *pdev) =09=09return PTR_ERR(charger->battery); =09} =20 +=09charger->reg =3D devm_regulator_get_optional(&pdev->dev, "charger"); +=09if (IS_ERR(charger->reg)) { +=09=09if (PTR_ERR(charger->reg) =3D=3D -EPROBE_DEFER) +=09=09=09return -EPROBE_DEFER; +=09=09dev_info(&pdev->dev, "couldn't get charger regulator\n"); +=09} +=09charger->edev =3D extcon_get_edev_by_phandle(&pdev->dev, 0); +=09if (IS_ERR(charger->edev)) { +=09=09if (PTR_ERR(charger->edev) =3D=3D -EPROBE_DEFER) +=09=09=09return -EPROBE_DEFER; +=09=09dev_info(charger->dev, "couldn't get extcon device\n"); +=09} + +=09if (!IS_ERR(charger->reg) && !IS_ERR(charger->edev)) { +=09=09INIT_WORK(&charger->extcon_work, max8997_battery_extcon_evt_worker); +=09=09ret =3D devm_add_action(&pdev->dev, max8997_battery_extcon_evt_stop_= work, charger); +=09=09if (ret) { +=09=09=09dev_err(&pdev->dev, "failed to add extcon evt stop action: %d\n",= ret); +=09=09=09return ret; +=09=09} +=09=09charger->extcon_nb.notifier_call =3D max8997_battery_extcon_evt; +=09=09ret =3D devm_extcon_register_notifier_all(&pdev->dev, charger->edev, +=09=09=09=09=09=09=09&charger->extcon_nb); +=09=09if (ret) { +=09=09=09dev_err(&pdev->dev, "failed to register extcon notifier\n"); +=09=09=09return ret; +=09=09}; +=09} + =09return 0; } =20 --=20 2.25.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1215DC433E0 for ; Wed, 30 Dec 2020 20:54:39 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CD45B206F6 for ; Wed, 30 Dec 2020 20:54:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CD45B206F6 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=protonmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:Reply-To:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID: Subject:From:To:Date:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=UJtM3RDWs1XHeLwKIYr9WM36qmGutExQMsfwwGcaZ3I=; b=JuoeC5eFjFVpD8kiaWorQ6aKUm A1KqeVAjGGET+yNHSsixlReb0LGnk4yLHZYUyJKcdZqyCAfh03/trqfm/liq+DsQj7d8LRzyIynbU x4v3SBEgBzKdeufswywsZh2mNA72EXg5VcxGgQQwuHyWes9hWeOlL3ATjltV7js59NkZSlKcmyl+y FKR1FjP/HIXjO6s6fqc+5PY/nlrI+gzxj8RsogjOZwruc5BXeS2uha2inL+dDIE9SsbM4Ms1lys/2 Hc2qyKqtHNTfvbaGB6isLSR8wGXwSDYtTYNxPCtW3LPSmhIbzg+rAAHEX0dNBXMSX7YhFwfqKG8pr mVZj1Yrg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kuiSF-0007Ti-Hq; Wed, 30 Dec 2020 20:52:23 +0000 Received: from mail1.protonmail.ch ([185.70.40.18]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kuiSB-0007Sm-Ou for linux-arm-kernel@lists.infradead.org; Wed, 30 Dec 2020 20:52:21 +0000 Date: Wed, 30 Dec 2020 20:52:15 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1609361537; bh=UxHJgzvxLBvgzIBtDDuqwhFJdVNTbPAqh4otZLsJ9dk=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=hkRAFSrlGTbmMgk/e1mAV1wImgUVq8I7SiB8CQFJNJlvi/o7lPBCfRhu7hSrU0IfF ujVbJmRnpUPI29nHaSHGkUVZsdVELM6UpuOSU/O1562S04KV1HgaE3dIuJkUJUjilb rBsR7JP4JtZg5ileV+GWwODsjKGV1gurdOiFoCw4= To: Krzysztof Kozlowski From: Timon Baetz Subject: [PATCH v6 3/8] power: supply: max8997_charger: Set CHARGER current limit Message-ID: <20201230205139.1812366-3-timon.baetz@protonmail.com> In-Reply-To: <20201230205139.1812366-1-timon.baetz@protonmail.com> References: <20201230205139.1812366-1-timon.baetz@protonmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201230_155220_085631_11C2C148 X-CRM114-Status: GOOD ( 12.55 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Timon Baetz Cc: devicetree@vger.kernel.org, linux-samsung-soc@vger.kernel.org, Timon Baetz , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Mark Brown , Liam Girdwood , Rob Herring , Sebastian Reichel , Chanwoo Choi , MyungJoo Ham , ~postmarketos/upstreaming@lists.sr.ht, Lee Jones , linux-arm-kernel@lists.infradead.org, Marek Szyprowski Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 --- 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 #include +#include #include #include #include #include #include #include +#include /* 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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel