Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp10829770pxu; Wed, 30 Dec 2020 12:55:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJwoDEhX09y46s25/E0avCVDDz275LSK7cQVw/++x/pVkAN5bdi4cd5WhF4NEadm0y4M1TLC X-Received: by 2002:a05:6402:895:: with SMTP id e21mr52457868edy.284.1609361710060; Wed, 30 Dec 2020 12:55:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609361710; cv=none; d=google.com; s=arc-20160816; b=T6Cd429kW+VZBWogA0yNYBKu1Bt/NwP04L+ulYjg9qE9oEa2/7htOphi5xVu7JarRd +U/Wlq39BoGALwaH6FTw2jL/1kpnkZFcsJx7AeCtoJM6Sm9GNMeQAhFI81T6dnLws+Qj FGcxHUWIgKzbuX19SMrV7hRRgYQ7qj4yf8ERXypOGFBuYX2uuMjmG8aIwERgmbjvtPhB JHywrPWS66QBHaj6h5HrSy04a3lZDzI9vedUY4o8TeUDNoClk0sKVf3BGgeCogtTCvpZ Qj7XePpf7UFIhlGatbQQJlfgmj9IK69qaZXfJn/+xd6EHDOdttcJkWU82bs8vySIofAx 4r7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:subject:reply-to:cc:from:to :dkim-signature:date; bh=UxHJgzvxLBvgzIBtDDuqwhFJdVNTbPAqh4otZLsJ9dk=; b=FDkHAyO55OynZDcjPFiptzZH1WjRaWAu7iQd9Sbq2KMQ4lQAt7LLyIvcgpHoxvn84A UTjW7g40UfIiA7BQvmi9TXqpTzZU4mBxnUyuklMSrUBn6K/olVSQ6CyxOB8ADpzY/Ss8 JIgxm29jtcBg7a4AIjEt2G6icJqub5VM1wrnQKs6/0QPHBjHOjhlpCkCZQM6EnMwytsv k32nUs74XMtj0j/6ciW3R6S9XT2wzptyfZlgUwo93Vm+u5GtYBxLpz5Fcs/VTcGhHGHU lkCky2FVGkGTYa15IkvgMbzzKnCFnD+fPbiK2+oFii+RC3zpeUqxdpDFjn9Zv3PeKOE9 sg6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@protonmail.com header.s=protonmail header.b=hkRAFSrl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=protonmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f5si23828378eds.162.2020.12.30.12.54.47; Wed, 30 Dec 2020 12:55:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@protonmail.com header.s=protonmail header.b=hkRAFSrl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=protonmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726545AbgL3UxB (ORCPT + 99 others); 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 X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch 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