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 49CE3C433E0 for ; Wed, 23 Dec 2020 08:11:31 +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 B5D00207D0 for ; Wed, 23 Dec 2020 08:11:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B5D00207D0 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=Z14bUWfZ4NGuDfTHBD8nWVxA1HUATXpyWWRAFcZOhBA=; b=tr1XkrVYlHAY7qu1Wqmcu+2D+t UiB7D/8YYRXLpykKumyvI0fr3/uQH45KMCd1+8P5+r9i0li6UgLAljxxkm1c955Iya3dkM7vJuf+t 3pmtLKuE4bIA1SWQtwkSYdbNnM73GXWtIHGFhJOcilqJC2vMxAfWKAxSxRjLK2TJgmNvkOY6ey2jl Vvgkjee4L61bPCgJ7q1ahul04aykM+vPcc7gDyM+CxNRLN8MlJHJIG5PJ6wdG8wdHniwL87L70ucV KT0AIXlHVIjpGbd4XGq7ZN85vQsEfa0RREAQHnmqPIjMIbmqrsSC9KejNrthIOQMNzZevunzV24O6 45V81QYg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1krzDj-0006Y1-Gn; Wed, 23 Dec 2020 08:10:07 +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 1krzDg-0006XA-01 for linux-arm-kernel@lists.infradead.org; Wed, 23 Dec 2020 08:10:05 +0000 Date: Wed, 23 Dec 2020 08:09:55 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1608710997; bh=GMlfVIZL/UQ0llYJN+djOiQkhs6kpbE53PRyZR6cwiY=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=w6Qjq3FtWNe6QHjBkYROPa/fkU26bkUpSb1Xm2wYNZu89Iz8+TUU5I4Ow4ORC+cZK JP6BrFQao1WAhgeVXET3hfHbPva6Kvem4MNGb93XZiHlwswCAws8GTjSabS/pXf+hx 3TVcC/MZKUNJs61kAMgyX7apAmtxmliby/AinP8g= To: Krzysztof Kozlowski From: Timon Baetz Subject: Re: [PATCH v3 4/7] power: supply: max8997_charger: Set CHARGER current limit Message-ID: <20201223090114.750664cd.timon.baetz@protonmail.com> In-Reply-To: <20201222084004.GD5026@kozik-lap> References: <20201222070520.710096-1-timon.baetz@protonmail.com> <20201222070520.710096-4-timon.baetz@protonmail.com> <20201222084004.GD5026@kozik-lap> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201223_031004_402791_0D72AB30 X-CRM114-Status: GOOD ( 20.75 ) 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 Tue, 22 Dec 2020 09:40:04 +0100, Krzysztof Kozlowski wrote: > On Tue, Dec 22, 2020 at 07:31:40AM +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 | 94 ++++++++++++++++++++++++++ > > 1 file changed, 94 insertions(+) > > > > diff --git a/drivers/power/supply/max8997_charger.c b/drivers/power/supply/max8997_charger.c > > index 1947af25879a..673ffff14ae0 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,33 @@ static int max8997_battery_probe(struct platform_device *pdev) > > return PTR_ERR(charger->battery); > > } > > > > + charger->reg = devm_regulator_get(&pdev->dev, "charger"); > > The code looks good but isn't it breaking all existing platforms? So there is 2 other DTS in the kernel sources that are using MAX8997 pmic: - Insignal Origen evaluation board - Samsung Trats Non of them have charging regulators. Also probing of the charger has been failing for long time because of https://lore.kernel.org/lkml/20201109194251.562203-2-timon.baetz@protonmail.com/ but that seems to land in 5.11. That being said, I guess I could make extcon and charger-supply optional if you prefer. Thanks again for reviewing, Timon _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel