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=-19.0 required=3.0 tests=BAYES_00,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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 5180BC433E9 for ; Mon, 21 Dec 2020 14:17:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2FF3322CB3 for ; Mon, 21 Dec 2020 14:17:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726841AbgLUORN (ORCPT ); Mon, 21 Dec 2020 09:17:13 -0500 Received: from mail-wr1-f54.google.com ([209.85.221.54]:41847 "EHLO mail-wr1-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726614AbgLUORM (ORCPT ); Mon, 21 Dec 2020 09:17:12 -0500 Received: by mail-wr1-f54.google.com with SMTP id a12so11209935wrv.8; Mon, 21 Dec 2020 06:16:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=mVeWgyliwzskZ+KRlAO9X7tnwzK9E0d61eIl/kpYMOI=; b=f3xsyZj/s0XdWDrv/cPgM6U0CRMvtEXC78nx4dL+lKxGApyELF3Se3aBhAHvqELYcI umx7Uqbmv01lNi45ifDnNfsR7bhFcKgaTcPjC/ytzaa4CCNilWmu4pw+Cx5ZnwCcidWL 27uJtODQRTJ9BWF16RKkQjb9A2Z175bsF8o264RbenVECTPTHU3uGIGYSWE5RKJoA7I0 J0tCf2Cr0DosURSvohPCeojEND+F6/z8NxYR5vSqbCT70Ya1JZvf0+yZUe+GlLzhvdvy LlPCb5JUHy8zPHc+dSZ2/LkTbPKeVfgZcUSOipcBcqU1YWCRcPvQkglwQLAHnyRJB34o 7CJw== X-Gm-Message-State: AOAM533qffRmf5pLeNfMpU19T1k9BFJbdWk4uY8hbH71RWuQeFgUeN6k pH8JVLZ+bVyQoFqqwXjPS5U= X-Google-Smtp-Source: ABdhPJyPaa8Fyv+Fdc83GXUM3HR1O5kuyDricPO3yf6KVYni22OM6jcByCJMLduSL7j9RAriZRIbuw== X-Received: by 2002:adf:ee4d:: with SMTP id w13mr18994130wro.216.1608560190391; Mon, 21 Dec 2020 06:16:30 -0800 (PST) Received: from kozik-lap (adsl-84-226-167-205.adslplus.ch. [84.226.167.205]) by smtp.googlemail.com with ESMTPSA id w4sm22637798wmc.13.2020.12.21.06.16.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Dec 2020 06:16:28 -0800 (PST) Date: Mon, 21 Dec 2020 15:16:27 +0100 From: Krzysztof Kozlowski To: 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 Subject: Re: [PATCH v2 2/6] power: supply: max8997_charger: Set CHARGER current limit Message-ID: <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> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20201221095001.595366-2-timon.baetz@protonmail.com> Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org 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? Best regards, Krzysztof