From patchwork Tue Dec 22 07:31:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timon Baetz X-Patchwork-Id: 351682 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=-12.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,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 239C2C433E0 for ; Tue, 22 Dec 2020 07:32:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E98E92079A for ; Tue, 22 Dec 2020 07:32:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726082AbgLVHcR (ORCPT ); Tue, 22 Dec 2020 02:32:17 -0500 Received: from mail-40131.protonmail.ch ([185.70.40.131]:23780 "EHLO mail-40131.protonmail.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726070AbgLVHcA (ORCPT ); Tue, 22 Dec 2020 02:32:00 -0500 Date: Tue, 22 Dec 2020 07:31:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1608622277; bh=uD0o1RGxUdohZwqEit8GaCkXhH2zAclkKXfTpSwZqmA=; h=Date:To:From:Cc:Reply-To:Subject:From; b=YNkxNP1CjHq3ry96pM3okOw2TEp9G7NBSRJc42Gt8dDgcnpWw40ckl5ryYit8mbfN l8dOVEDFfQ8gfrc4aPiCRtgJO3xg+FxNSxilfM91F1pA9Emu/R9/hs29cdNDkTwZje DWm9sBcJh42gcHRzPTj/UYPIkPs1cuWjrSBjaoCY= 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, Timon Baetz Reply-To: Timon Baetz Subject: [PATCH v3 1/7] extcon: max8997: Add CHGINS and CHGRM interrupt handling Message-ID: <20201222070520.710096-1-timon.baetz@protonmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org This allows the MAX8997 charger to set the current limit depending on the detected extcon charger type. Signed-off-by: Timon Baetz --- drivers/extcon/extcon-max8997.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/extcon/extcon-max8997.c b/drivers/extcon/extcon-max8997.c index 337b0eea4e62..e1408075ef7d 100644 --- a/drivers/extcon/extcon-max8997.c +++ b/drivers/extcon/extcon-max8997.c @@ -44,6 +44,8 @@ static struct max8997_muic_irq muic_irqs[] = { { MAX8997_MUICIRQ_ChgDetRun, "muic-CHGDETRUN" }, { MAX8997_MUICIRQ_ChgTyp, "muic-CHGTYP" }, { MAX8997_MUICIRQ_OVP, "muic-OVP" }, + { MAX8997_PMICIRQ_CHGINS, "pmic-CHGINS" }, + { MAX8997_PMICIRQ_CHGRM, "pmic-CHGRM" }, }; /* Define supported cable type */ @@ -538,6 +540,8 @@ static void max8997_muic_irq_work(struct work_struct *work) case MAX8997_MUICIRQ_DCDTmr: case MAX8997_MUICIRQ_ChgDetRun: case MAX8997_MUICIRQ_ChgTyp: + case MAX8997_PMICIRQ_CHGINS: + case MAX8997_PMICIRQ_CHGRM: /* Handle charger cable */ ret = max8997_muic_chg_handler(info); break; From patchwork Tue Dec 22 07:31:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timon Baetz X-Patchwork-Id: 346815 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=-12.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, 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 CD941C4332D for ; Tue, 22 Dec 2020 07:32:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A5B0D23159 for ; Tue, 22 Dec 2020 07:32:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726176AbgLVHcI (ORCPT ); Tue, 22 Dec 2020 02:32:08 -0500 Received: from mail2.protonmail.ch ([185.70.40.22]:41324 "EHLO mail2.protonmail.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725782AbgLVHcH (ORCPT ); Tue, 22 Dec 2020 02:32:07 -0500 Date: Tue, 22 Dec 2020 07:31:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1608622284; bh=zj7BLVma6bwTDbkNV2OP9sFWg/3xvXVUsybje3al6Cg=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=r3C02VT9/wOS5O5ImAMG6zrfSVRoM5vFDZBuCezPuMsu6pdjTrzqkn2jDZK+uJHd1 lZNL6nkOL/VUT00XD60ghn6SL7eXHl2N1RZACf5FTonRmdPBYWF9jQpJXHRmfJ99Yk uSDES7TeCE7GFRdoqK8+aMGckY/dVzkAatDTVCVk= 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, Timon Baetz Reply-To: Timon Baetz Subject: [PATCH v3 2/7] regulator: dt-bindings: Document max8997-pmic nodes Message-ID: <20201222070520.710096-2-timon.baetz@protonmail.com> In-Reply-To: <20201222070520.710096-1-timon.baetz@protonmail.com> References: <20201222070520.710096-1-timon.baetz@protonmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org Add maxim,max8997-battery and maxim,max8997-muic optional nodes. Signed-off-by: Timon Baetz Acked-by: Krzysztof Kozlowski --- .../bindings/regulator/max8997-regulator.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Documentation/devicetree/bindings/regulator/max8997-regulator.txt b/Documentation/devicetree/bindings/regulator/max8997-regulator.txt index 6fe825b8ac1b..f969fc09fe29 100644 --- a/Documentation/devicetree/bindings/regulator/max8997-regulator.txt +++ b/Documentation/devicetree/bindings/regulator/max8997-regulator.txt @@ -53,6 +53,17 @@ Additional properties required if either of the optional properties are used: - max8997,pmic-buck125-dvs-gpios: GPIO specifiers for three host gpio's used for dvs. The format of the gpio specifier depends in the gpio controller. +Optional nodes: +- charger: Node for configuring the charger driver. + Required properties: + - compatible: "maxim,max8997-battery" + - extcon: extcon specifier for charging events + - charger-supply: regulator node for charging current + +- muic: Node used only by extcon consumers. + Required properties: + - compatible: "maxim,max8997-muic" + Regulators: The regulators of max8997 that have to be instantiated should be included in a sub-node named 'regulators'. Regulator nodes included in this sub-node should be of the format as listed below. From patchwork Tue Dec 22 07:31:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timon Baetz X-Patchwork-Id: 346814 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=-12.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,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 7D07DC433E6 for ; Tue, 22 Dec 2020 07:32:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 37D6D2312E for ; Tue, 22 Dec 2020 07:32:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726232AbgLVHcU (ORCPT ); Tue, 22 Dec 2020 02:32:20 -0500 Received: from mail-40131.protonmail.ch ([185.70.40.131]:17302 "EHLO mail-40131.protonmail.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726070AbgLVHcU (ORCPT ); Tue, 22 Dec 2020 02:32:20 -0500 Date: Tue, 22 Dec 2020 07:31:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1608622298; bh=acDpNkZlgg3POOor0u+D9TYzB52a154XD9l+kpesuTk=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=Y+0wYvh1sNFvDJ7GaEsz7CSvTVl5AcWplAExE2FOz5s5Z0cFMW6z5+kgSUfxD4Yeo BgmJ6rb16cNTHTzbAT2KBEH2ysVA0YzBTnRiwEa4UZ/peV0BHQjjVLK5aIxxei5YwA UZNgblphgzKZCBZ48l/8mAunvM5/8SRGWNnuJLyo= 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, Timon Baetz Reply-To: Timon Baetz Subject: [PATCH v3 3/7] mfd: max8997: Add of_compatible to extcon and charger mfd_cell Message-ID: <20201222070520.710096-3-timon.baetz@protonmail.com> In-Reply-To: <20201222070520.710096-1-timon.baetz@protonmail.com> References: <20201222070520.710096-1-timon.baetz@protonmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org Add of_compatible ("maxim,max8997-muic") to the mfd_cell to have a of_node set in the extcon driver. Add of_compatible ("maxim,max8997-battery") to the mfd_cell to configure the charger driver. Signed-off-by: Timon Baetz --- drivers/mfd/max8997.c | 4 ++-- 1 file changed, 2 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", }, { .name = "max8997-led", .id = 1 }, { .name = "max8997-led", .id = 2 }, }; From patchwork Tue Dec 22 07:31:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timon Baetz X-Patchwork-Id: 351681 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, 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 2148CC43331 for ; Tue, 22 Dec 2020 07:32:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F0ACE23139 for ; Tue, 22 Dec 2020 07:32:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726309AbgLVHcf (ORCPT ); Tue, 22 Dec 2020 02:32:35 -0500 Received: from mail1.protonmail.ch ([185.70.40.18]:56017 "EHLO mail1.protonmail.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725870AbgLVHcc (ORCPT ); Tue, 22 Dec 2020 02:32:32 -0500 X-Greylist: delayed 77904 seconds by postgrey-1.27 at vger.kernel.org; Tue, 22 Dec 2020 02:32:31 EST Date: Tue, 22 Dec 2020 07:31:40 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1608622309; bh=vIBQMFcPvlKgWWqpFAMJZyX884f6sEPpsF4Cdw6LW04=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=BnwUXwjtLJ8u6fi+/wMOGLLYeYyBoboeJRN8q16fiAW5obB/zuCjCy+lvLuGCSHzh x/4beooXv26YoMmekccE3HpAg2I/vbI9z4vQRF0bEvueoWXf9Bl8jRJbTav1Rl9DEc dgg3G7Gal7DaERqLHmXSKvJ3MPIfHG6iYzV090e4= 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, Timon Baetz Reply-To: Timon Baetz Subject: [PATCH v3 4/7] power: supply: max8997_charger: Set CHARGER current limit Message-ID: <20201222070520.710096-4-timon.baetz@protonmail.com> In-Reply-To: <20201222070520.710096-1-timon.baetz@protonmail.com> References: <20201222070520.710096-1-timon.baetz@protonmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@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 --- 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"); + if (IS_ERR(charger->reg)) { + dev_err(&pdev->dev, "couldn't get charger regulator\n"); + return PTR_ERR(charger->reg); + } + + charger->edev = extcon_get_edev_by_phandle(&pdev->dev, 0); + if (IS_ERR(charger->edev)) { + if (PTR_ERR(charger->edev) != -EPROBE_DEFER) + dev_err(charger->dev, "couldn't get extcon device\n"); + return PTR_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; } From patchwork Tue Dec 22 07:31:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timon Baetz X-Patchwork-Id: 346813 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=-12.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,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 A6B82C432C3 for ; Tue, 22 Dec 2020 07:32:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7583223120 for ; Tue, 22 Dec 2020 07:32:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726317AbgLVHcg (ORCPT ); Tue, 22 Dec 2020 02:32:36 -0500 Received: from mail-40134.protonmail.ch ([185.70.40.134]:52071 "EHLO mail-40134.protonmail.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726279AbgLVHcc (ORCPT ); Tue, 22 Dec 2020 02:32:32 -0500 Date: Tue, 22 Dec 2020 07:31:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1608622310; bh=yKsd9EiB1lb1beK3a4KefGe56jveojVKszto/Y3gwDs=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=a4wvvJF5NU49JOEzl7ir6mlYaDTcXn7LtTc8pvhMJCTnTjX651pM88QxVth3aQYDv jBXf03nbjwQGtj9fCujbRgEEzsdf3kpWekPAzNFbrQJh/VsG9t6C5/EJdbDiM1Ydsv vHYWnRgvvt95RpYGDH4u2oHKPKw+y6E0CNSTEufk= 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, Timon Baetz Reply-To: Timon Baetz Subject: [PATCH v3 5/7] ARM: dts: exynos: Added muic and charger nodes for i9100 Message-ID: <20201222070520.710096-5-timon.baetz@protonmail.com> In-Reply-To: <20201222070520.710096-1-timon.baetz@protonmail.com> References: <20201222070520.710096-1-timon.baetz@protonmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org muic node is only used for extcon consumers. charger node is used to specify muic and regulator. Signed-off-by: Timon Baetz --- arch/arm/boot/dts/exynos4210-i9100.dts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/arm/boot/dts/exynos4210-i9100.dts b/arch/arm/boot/dts/exynos4210-i9100.dts index 5370ee477186..8fa704babd5e 100644 --- a/arch/arm/boot/dts/exynos4210-i9100.dts +++ b/arch/arm/boot/dts/exynos4210-i9100.dts @@ -584,6 +584,16 @@ EN32KHZ_CP { regulator-always-on; }; }; + + muic: max8997-muic { + compatible = "maxim,max8997-muic"; + }; + + charger { + compatible = "maxim,max8997-battery"; + charger-supply = <&charger_reg>; + extcon = <&muic>; + }; }; }; From patchwork Tue Dec 22 07:31:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timon Baetz X-Patchwork-Id: 351680 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, 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 0848EC4321A for ; Tue, 22 Dec 2020 07:32:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CE1B323127 for ; Tue, 22 Dec 2020 07:32:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726345AbgLVHcp (ORCPT ); Tue, 22 Dec 2020 02:32:45 -0500 Received: from mail-40136.protonmail.ch ([185.70.40.136]:36846 "EHLO mail-40136.protonmail.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726336AbgLVHcp (ORCPT ); Tue, 22 Dec 2020 02:32:45 -0500 Date: Tue, 22 Dec 2020 07:31:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1608622322; bh=2J2HkMO1x6s17YhUEXyxsyS33PdVMCQ5VOjC6KfqhmA=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=aVvdIMuIvl9eX60Lfs0XVBeA8wxoTq79qCCHbtgWNN2LIDx8wYCCLLPisQtc/cvnl 2r4rbweGSMJxxe2US2etcOFm3x8xbv7fkLEWMZ1tQffs8yivInZ5b32Z7Awi53ZuHC ztbw1nW2kF8XXfLIjc9S1Htnfl1zwodil54vGk2M= 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, Timon Baetz Reply-To: Timon Baetz Subject: [PATCH v3 6/7] ARM: dts: exynos: Fix charging regulator voltage and current for i9100 Message-ID: <20201222070520.710096-6-timon.baetz@protonmail.com> In-Reply-To: <20201222070520.710096-1-timon.baetz@protonmail.com> References: <20201222070520.710096-1-timon.baetz@protonmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org Set CHARGER current and CHARGER_CV voltage according to Galaxy S2 Epic 4G Touch SPH-D710 Android vendor sources [0,1]. Remove regulator-always-on. The regulator can be enabled and disabled based on extcon events. [0] https://github.com/krzk/linux-vendor-backup/blob/samsung/galaxy-s2-epic-4g-touch-sph-d710-exynos4210-dump/drivers/power/max8997_charger_u1.c#L169-L170 [1] https://github.com/krzk/linux-vendor-backup/blob/samsung/galaxy-s2-epic-4g-touch-sph-d710-exynos4210-dump/drivers/power/max8997_charger_u1.c#L390-L391 Signed-off-by: Timon Baetz --- arch/arm/boot/dts/exynos4210-i9100.dts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/exynos4210-i9100.dts b/arch/arm/boot/dts/exynos4210-i9100.dts index 8fa704babd5e..586d801af0b5 100644 --- a/arch/arm/boot/dts/exynos4210-i9100.dts +++ b/arch/arm/boot/dts/exynos4210-i9100.dts @@ -562,15 +562,14 @@ safe2_sreg: ESAFEOUT2 { charger_reg: CHARGER { regulator-name = "CHARGER"; - regulator-min-microamp = <60000>; - regulator-max-microamp = <2580000>; - regulator-always-on; + regulator-min-microamp = <200000>; + regulator-max-microamp = <950000>; }; chargercv_reg: CHARGER_CV { regulator-name = "CHARGER_CV"; - regulator-min-microvolt = <3800000>; - regulator-max-microvolt = <4100000>; + regulator-min-microvolt = <4200000>; + regulator-max-microvolt = <4200000>; regulator-always-on; }; From patchwork Tue Dec 22 07:32:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timon Baetz X-Patchwork-Id: 346812 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=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 4E91DC433E0 for ; Tue, 22 Dec 2020 07:32:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1A2912079A for ; Tue, 22 Dec 2020 07:32:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726239AbgLVHcq (ORCPT ); Tue, 22 Dec 2020 02:32:46 -0500 Received: from mail-40131.protonmail.ch ([185.70.40.131]:42992 "EHLO mail-40131.protonmail.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726392AbgLVHcq (ORCPT ); Tue, 22 Dec 2020 02:32:46 -0500 Date: Tue, 22 Dec 2020 07:32:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1608622324; bh=CZAYsRHV593ZQXe0ik2Cb4E+1qQpPIw5P6nDjWNCENA=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=vFNyKAfSSLFW5+oyey/N+PnHFPivm/pEHugDx2bpmyWFBETLBf2nNqSjVXFhBzUeQ p66hxPlVYmy/9IMl/bIqQfMVxD2ADEI8EZaq/+G6tVX8mRwbpWpdUO25+CYKXyljcV 8L9jBTbniuDiMLZM9n2/s5YFnPO04SAiOp+f9/Mg= 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, Timon Baetz Reply-To: Timon Baetz Subject: [PATCH v3 7/7] ARM: dts: exynos: Add top-off charging regulator node for i9100 Message-ID: <20201222070520.710096-7-timon.baetz@protonmail.com> In-Reply-To: <20201222070520.710096-1-timon.baetz@protonmail.com> References: <20201222070520.710096-1-timon.baetz@protonmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org Value taken from Galaxy S2 Epic 4G Touch SPH-D710 Android vendor kernel [0] which always sets 200mA. Also rearrange regulators based on definition in max8997.h. [0] https://github.com/krzk/linux-vendor-backup/blob/samsung/galaxy-s2-epic-4g-touch-sph-d710-exynos4210-dump/drivers/power/sec_battery_u1.c#L1525 Signed-off-by: Timon Baetz --- arch/arm/boot/dts/exynos4210-i9100.dts | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/exynos4210-i9100.dts b/arch/arm/boot/dts/exynos4210-i9100.dts index 586d801af0b5..e702adb69670 100644 --- a/arch/arm/boot/dts/exynos4210-i9100.dts +++ b/arch/arm/boot/dts/exynos4210-i9100.dts @@ -560,6 +560,16 @@ safe2_sreg: ESAFEOUT2 { regulator-boot-on; }; + EN32KHZ_AP { + regulator-name = "EN32KHZ_AP"; + regulator-always-on; + }; + + EN32KHZ_CP { + regulator-name = "EN32KHZ_CP"; + regulator-always-on; + }; + charger_reg: CHARGER { regulator-name = "CHARGER"; regulator-min-microamp = <200000>; @@ -573,13 +583,10 @@ chargercv_reg: CHARGER_CV { regulator-always-on; }; - EN32KHZ_AP { - regulator-name = "EN32KHZ_AP"; - regulator-always-on; - }; - - EN32KHZ_CP { - regulator-name = "EN32KHZ_CP"; + CHARGER_TOPOFF { + regulator-name = "CHARGER_TOPOFF"; + regulator-min-microamp = <200000>; + regulator-max-microamp = <200000>; regulator-always-on; }; };