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.7 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=unavailable 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 4521BC433E6 for ; Thu, 24 Dec 2020 13:14:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 163B0227BF for ; Thu, 24 Dec 2020 13:14:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728824AbgLXNNu (ORCPT ); Thu, 24 Dec 2020 08:13:50 -0500 Received: from mail1.protonmail.ch ([185.70.40.18]:12529 "EHLO mail1.protonmail.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728017AbgLXNNt (ORCPT ); Thu, 24 Dec 2020 08:13:49 -0500 Date: Thu, 24 Dec 2020 13:13:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1608815585; bh=CNeV10U3kCwJJgZL2fsUMux+A8mhrt9SMQKIEFXyZBQ=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=DSqJYAjzawfGh46umurrsISbhLkHutuKvweH4SI/RVZY8Bv6NLgJR3De/+YVj3omU 7aWNr4bdNyh8Mb86RtB5vhD+YoJi5647tPI/gNTPHp04OUIR8R9rgXYrmBdU//Tx++ nlR5YGa2Yd8rAIps1SqKmQBS3fOf/bbdPYaNNCA8= To: Krzysztof Kozlowski From: Timon Baetz Cc: 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 Reply-To: Timon Baetz Subject: Re: [PATCH v4 4/7] power: supply: max8997_charger: Set CHARGER current limit Message-ID: <20201224141246.7ad0ffc4.timon.baetz@protonmail.com> In-Reply-To: <20201224095559.GB10937@kozik-lap> References: <20201223134221.804943-1-timon.baetz@protonmail.com> <20201223134221.804943-4-timon.baetz@protonmail.com> <20201224095559.GB10937@kozik-lap> 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 On Thu, 24 Dec 2020 10:55:59 +0100, Krzysztof Kozlowski wrote: > On Wed, Dec 23, 2020 at 01:43:05PM +0000, Timon Baetz wrote: > > 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-L1= 678 > > > > Signed-off-by: Timon Baetz > > --- > > drivers/power/supply/max8997_charger.c | 89 ++++++++++++++++++++++++++ > > 1 file changed, 89 insertions(+) > > > > diff --git a/drivers/power/supply/max8997_charger.c b/drivers/power/sup= ply/max8997_charger.c > > index 1947af25879a..e8532e2af451 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=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; > > }; > > > > static enum power_supply_property max8997_battery_props[] =3D { > > @@ -88,6 +94,67 @@ static int max8997_battery_get_property(struct power= _supply *psy, > > =09return 0; > > } > > > > +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_li= mit, current_limit); > > + > > +=09=09if (ret) { > > +=09=09=09dev_err(charger->dev, "failed to set current limit: %d\n", re= t); > > +=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", re= t); > > +=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,28 @@ static int max8997_battery_probe(struct platform_d= evice *pdev) > > =09=09return PTR_ERR(charger->battery); > > =09} > > > > +=09charger->reg =3D devm_regulator_get(&pdev->dev, "charger"); =20 >=20 > Since you do not use get_optional, you will always get a dummy > regulator. In case of error, you should either print it or entirely fail > the probe. Silently continuing makes it difficult to spot errors. >=20 > Since the driver could operate in case of extcon/regulator error, just > dev_err() so failure will be spotted with dmesg. I will switch to devm_regulator_get_optional() and print an error on=20 failure, thanks. > It will complain on older DTBs because you are introducing incompatible > change, but that's expected. Just correct all other in-tree DTS. The other 2 in-tree DTS don't have CHARGER regulators. Not sure how to correct those. Should I add muic and charger nodes without a charger-supply? It will still complain in that case. Thanks for guiding me through this, Timon > > +=09charger->edev =3D extcon_get_edev_by_phandle(&pdev->dev, 0); > > +=09if (PTR_ERR(charger->reg) =3D=3D -EPROBE_DEFER || > > +=09 PTR_ERR(charger->edev) =3D=3D -EPROBE_DEFER) > > +=09=09return -EPROBE_DEFER; > > + > > +=09if (!IS_ERR(charger->reg) && !IS_ERR(charger->edev)) { > > +=09=09INIT_WORK(&charger->extcon_work, max8997_battery_extcon_evt_work= er); > > +=09=09ret =3D devm_add_action(&pdev->dev, max8997_battery_extcon_evt_s= top_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->e= dev, > > +=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; > > } > > > > -- > > 2.25.1 > > > > =20 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.7 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 B13E3C433DB for ; Thu, 24 Dec 2020 13:15:02 +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 5A59920789 for ; Thu, 24 Dec 2020 13:15:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5A59920789 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=HepaPl2+TAOuBZAqZDhy0zNIkSXzWtW5Yl5Bb6d484Q=; b=Uk839lbEKHg5j/4Ak3CSM7UDzd rrfcpc5+XDxYMzom/Jif0xCFWG6t7LG/fBMLDd+JxXDyipnabU5REgXlbZpru8xqs3PV6EOBsZ230 jOJbQQ+7jgGBpiN6IGMKUj8eNZqPAziqOYxeCMnI8HtcqE7mvAxBdv0IjzURmCd8jRUZ2ikXIUkSQ je3af6/RvmxFmJxhxG9KdrEgAyVA9gv9oEC797a87VK72S0OlL0Nr9e+1ZIRfM5QOLBOWwEGlTzKX KTbj02jqzBQGRcrEoFv8JyU8b9m10UB7fB0vbJuZPPuVvuRJ3cfQpMZGemo0YXzK2/UUaD4Cn1mmJ v3d6ICog==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ksQQa-0008BU-VG; Thu, 24 Dec 2020 13:13:13 +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 1ksQQW-0008Ay-Hs for linux-arm-kernel@lists.infradead.org; Thu, 24 Dec 2020 13:13:09 +0000 Date: Thu, 24 Dec 2020 13:13:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1608815585; bh=CNeV10U3kCwJJgZL2fsUMux+A8mhrt9SMQKIEFXyZBQ=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=DSqJYAjzawfGh46umurrsISbhLkHutuKvweH4SI/RVZY8Bv6NLgJR3De/+YVj3omU 7aWNr4bdNyh8Mb86RtB5vhD+YoJi5647tPI/gNTPHp04OUIR8R9rgXYrmBdU//Tx++ nlR5YGa2Yd8rAIps1SqKmQBS3fOf/bbdPYaNNCA8= To: Krzysztof Kozlowski From: Timon Baetz Subject: Re: [PATCH v4 4/7] power: supply: max8997_charger: Set CHARGER current limit Message-ID: <20201224141246.7ad0ffc4.timon.baetz@protonmail.com> In-Reply-To: <20201224095559.GB10937@kozik-lap> References: <20201223134221.804943-1-timon.baetz@protonmail.com> <20201223134221.804943-4-timon.baetz@protonmail.com> <20201224095559.GB10937@kozik-lap> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201224_081308_935079_77E32702 X-CRM114-Status: GOOD ( 24.53 ) 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, 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 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 On Thu, 24 Dec 2020 10:55:59 +0100, Krzysztof Kozlowski wrote: > On Wed, Dec 23, 2020 at 01:43:05PM +0000, Timon Baetz wrote: > > 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 > > --- > > drivers/power/supply/max8997_charger.c | 89 ++++++++++++++++++++++++++ > > 1 file changed, 89 insertions(+) > > > > diff --git a/drivers/power/supply/max8997_charger.c b/drivers/power/supply/max8997_charger.c > > index 1947af25879a..e8532e2af451 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,28 @@ static int max8997_battery_probe(struct platform_device *pdev) > > return PTR_ERR(charger->battery); > > } > > > > + charger->reg = devm_regulator_get(&pdev->dev, "charger"); > > Since you do not use get_optional, you will always get a dummy > regulator. In case of error, you should either print it or entirely fail > the probe. Silently continuing makes it difficult to spot errors. > > Since the driver could operate in case of extcon/regulator error, just > dev_err() so failure will be spotted with dmesg. I will switch to devm_regulator_get_optional() and print an error on failure, thanks. > It will complain on older DTBs because you are introducing incompatible > change, but that's expected. Just correct all other in-tree DTS. The other 2 in-tree DTS don't have CHARGER regulators. Not sure how to correct those. Should I add muic and charger nodes without a charger-supply? It will still complain in that case. Thanks for guiding me through this, Timon > > + charger->edev = extcon_get_edev_by_phandle(&pdev->dev, 0); > > + if (PTR_ERR(charger->reg) == -EPROBE_DEFER || > > + PTR_ERR(charger->edev) == -EPROBE_DEFER) > > + return -EPROBE_DEFER; > > + > > + 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