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,URIBL_BLOCKED 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 0019FC433DB for ; Mon, 21 Dec 2020 15:36:55 +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 BB71822BED for ; Mon, 21 Dec 2020 15:36:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BB71822BED 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=qRMpV0/odTbsEH1hZK7h6diNvCLF6R31vBpFBEv1EOc=; b=Qt4ENGmuyVPISPzYBg4ZFFgayi CW2FV6Gr2GRGSiYRqChCiVkdzOO1cxVNNGMh82zeCMD8mtFY5iIbtLj3mXjV+l76uCDcSovwHrZ5O 4G+wblzC5KdHQ0C8dekTDestIWO0XhX4m/vANFyReG8KN/V4YOThtWEWJYVV2zS2OW9g3LNhF9Si0 7qFnoOsbh4OPTReFzYuwb0O+h4yM1o89fvOIX2kRUYsAdHvelpl8ubgiBDQNwHH/4hKZBeeIHpDKj MRwuXZnmV6gGIqLeKeb69uD4vJVzSJHlXemhzGC9t37Ycma7/iV7heGRW3mO7qxAW4S8tvUJL1lqW NBA4/DrA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1krNDW-0005v7-Dt; Mon, 21 Dec 2020 15:35:22 +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 1krNDS-0005ue-I6 for linux-arm-kernel@lists.infradead.org; Mon, 21 Dec 2020 15:35:20 +0000 Date: Mon, 21 Dec 2020 15:35:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1608564914; bh=QlvYjnjuTAtkMuwvMNdku+ZoqZhVDZ+Fm2DxZu8MGUs=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=xgYRsrC+ZlmB1pEaPNW9V9voN7GmhNjvXm2i9mFT+hH0CYvPqUsO3QemYdsPS7f+M bB6pO64IRpZ/V8MuytTlKiGNknX8MnqpsGA54FYCK/ecBJuqTSo3wx71F/pmxtWm+j ks55MUJs8MnwS8K72sCOwfaw3t/TzEMmgPgpfpsM= To: Krzysztof Kozlowski From: Timon Baetz Subject: Re: [PATCH v2 2/6] power: supply: max8997_charger: Set CHARGER current limit Message-ID: <20201221163455.2c3f095d.timon.baetz@protonmail.com> In-Reply-To: <20201221141627.GB33797@kozik-lap> References: <20201202203516.43053-1-timon.baetz@protonmail.com> <20201221095001.595366-1-timon.baetz@protonmail.com> <20201221095001.595366-2-timon.baetz@protonmail.com> <20201221141627.GB33797@kozik-lap> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201221_103518_982572_70D4E0A5 X-CRM114-Status: GOOD ( 22.73 ) 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 Mon, 21 Dec 2020 15:16:27 +0100, Krzysztof Kozlowski wrote: > On Mon, Dec 21, 2020 at 09:53:15AM +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/mfd/max8997.c | 4 +- > > drivers/power/supply/max8997_charger.c | 94 ++++++++++++++++++++++++++ > > 2 files changed, 96 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/mfd/max8997.c b/drivers/mfd/max8997.c > > index 68d8f2b95287..55d3a6f97783 100644 > > --- a/drivers/mfd/max8997.c > > +++ b/drivers/mfd/max8997.c > > @@ -29,9 +29,9 @@ > > static const struct mfd_cell max8997_devs[] = { > > { .name = "max8997-pmic", }, > > { .name = "max8997-rtc", }, > > - { .name = "max8997-battery", }, > > + { .name = "max8997-battery", .of_compatible = "maxim,max8997-battery", }, > > { .name = "max8997-haptic", }, > > - { .name = "max8997-muic", }, > > + { .name = "max8997-muic", .of_compatible = "maxim,max8997-muic", }, > > Undocumented bindings. The checkpatch should complain about it, so I > assume you did not run it. Please run the checkpatch. > > > { .name = "max8997-led", .id = 1 }, > > { .name = "max8997-led", .id = 2 }, > > }; > > diff --git a/drivers/power/supply/max8997_charger.c b/drivers/power/supply/max8997_charger.c > > index 1947af25879a..6e8750e455ea 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, ret; > > + > > + 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) { > > + 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); > > + goto regulator_disable; > > Unusual error path... if regulator was not enabled before and > regulator_set_current_limit() failed, you disable the regulator? Why? > Wasn't it already disabled? Because I thought you asked me to in v1 of this patch: > Failure of setting the current should rather disable the charging. I probably misunderstood you comment then. So I guess it should just return? Thanks for reviewing, Timon _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel