From patchwork Thu Aug 24 13:13:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emmanuel Gil Peyrot X-Patchwork-Id: 716767 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B4C7AC7113B for ; Thu, 24 Aug 2023 13:14:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240392AbjHXNOR (ORCPT ); Thu, 24 Aug 2023 09:14:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47548 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240486AbjHXNNw (ORCPT ); Thu, 24 Aug 2023 09:13:52 -0400 Received: from luna.linkmauve.fr (82-65-109-163.subs.proxad.net [82.65.109.163]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 623D1198B; Thu, 24 Aug 2023 06:13:50 -0700 (PDT) Received: by luna.linkmauve.fr (Postfix, from userid 1000) id 367988CC659; Thu, 24 Aug 2023 15:13:49 +0200 (CEST) From: Emmanuel Gil Peyrot Cc: Emmanuel Gil Peyrot , Alexandre Courbot , azkali , CTCaer , Sebastian Reichel , Rob Herring , Krzysztof Kozlowski , Conor Dooley , linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/3] dt-bindings: power: supply: bq24190: Add ti,bq24193 Date: Thu, 24 Aug 2023 15:13:29 +0200 Message-ID: <20230824131342.206784-2-linkmauve@linkmauve.fr> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230824131342.206784-1-linkmauve@linkmauve.fr> References: <20230824112741.201353-1-linkmauve@linkmauve.fr> <20230824131342.206784-1-linkmauve@linkmauve.fr> MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org This power supply device is used in the Nintendo Switch. Signed-off-by: Alexandre Courbot Signed-off-by: Emmanuel Gil Peyrot --- Documentation/devicetree/bindings/power/supply/bq24190.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/power/supply/bq24190.yaml b/Documentation/devicetree/bindings/power/supply/bq24190.yaml index d3ebc9de8c0b..2ad107589a16 100644 --- a/Documentation/devicetree/bindings/power/supply/bq24190.yaml +++ b/Documentation/devicetree/bindings/power/supply/bq24190.yaml @@ -19,6 +19,7 @@ properties: - ti,bq24190 - ti,bq24192 - ti,bq24192i + - ti,bq24193 - ti,bq24196 reg: From patchwork Thu Aug 24 13:13:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emmanuel Gil Peyrot X-Patchwork-Id: 717169 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6EF23C88CB9 for ; Thu, 24 Aug 2023 13:14:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240506AbjHXNOS (ORCPT ); Thu, 24 Aug 2023 09:14:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47626 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240643AbjHXNNx (ORCPT ); Thu, 24 Aug 2023 09:13:53 -0400 Received: from luna.linkmauve.fr (82-65-109-163.subs.proxad.net [82.65.109.163]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A71A19A6; Thu, 24 Aug 2023 06:13:51 -0700 (PDT) Received: by luna.linkmauve.fr (Postfix, from userid 1000) id 484888CC65B; Thu, 24 Aug 2023 15:13:50 +0200 (CEST) From: Emmanuel Gil Peyrot Cc: Alexandre Courbot , Emmanuel Gil Peyrot , azkali , CTCaer , Sebastian Reichel , Rob Herring , Krzysztof Kozlowski , Conor Dooley , linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/3] power: supply: bq24190_charger: Support bq24193 Date: Thu, 24 Aug 2023 15:13:30 +0200 Message-ID: <20230824131342.206784-3-linkmauve@linkmauve.fr> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230824131342.206784-1-linkmauve@linkmauve.fr> References: <20230824112741.201353-1-linkmauve@linkmauve.fr> <20230824131342.206784-1-linkmauve@linkmauve.fr> MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org From: Alexandre Courbot This charger is working with the driver as-is, so enable it to be probed. It is used in the Nintendo Switch for instance. Signed-off-by: Alexandre Courbot Signed-off-by: Emmanuel Gil Peyrot --- drivers/power/supply/bq24190_charger.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/power/supply/bq24190_charger.c b/drivers/power/supply/bq24190_charger.c index ef8235848f56..a56122b39687 100644 --- a/drivers/power/supply/bq24190_charger.c +++ b/drivers/power/supply/bq24190_charger.c @@ -2018,6 +2018,7 @@ static const struct dev_pm_ops bq24190_pm_ops = { static const struct i2c_device_id bq24190_i2c_ids[] = { { "bq24190" }, { "bq24192" }, + { "bq24193" }, { "bq24192i" }, { "bq24196" }, { }, @@ -2027,6 +2028,7 @@ MODULE_DEVICE_TABLE(i2c, bq24190_i2c_ids); static const struct of_device_id bq24190_of_match[] = { { .compatible = "ti,bq24190", }, { .compatible = "ti,bq24192", }, + { .compatible = "ti,bq24193", }, { .compatible = "ti,bq24192i", }, { .compatible = "ti,bq24196", }, { }, From patchwork Thu Aug 24 13:13:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emmanuel Gil Peyrot X-Patchwork-Id: 717170 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 14D7DC71145 for ; Thu, 24 Aug 2023 13:14:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240684AbjHXNOT (ORCPT ); Thu, 24 Aug 2023 09:14:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240691AbjHXNNy (ORCPT ); Thu, 24 Aug 2023 09:13:54 -0400 Received: from luna.linkmauve.fr (82-65-109-163.subs.proxad.net [82.65.109.163]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 83D7519A9; Thu, 24 Aug 2023 06:13:52 -0700 (PDT) Received: by luna.linkmauve.fr (Postfix, from userid 1000) id 49E5A8CC65D; Thu, 24 Aug 2023 15:13:51 +0200 (CEST) From: Emmanuel Gil Peyrot Cc: Alexandre Courbot , Emmanuel Gil Peyrot , azkali , CTCaer , Sebastian Reichel , Rob Herring , Krzysztof Kozlowski , Conor Dooley , linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/3] power: supply: bq24190_charger: Export current regulator Date: Thu, 24 Aug 2023 15:13:31 +0200 Message-ID: <20230824131342.206784-4-linkmauve@linkmauve.fr> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230824131342.206784-1-linkmauve@linkmauve.fr> References: <20230824112741.201353-1-linkmauve@linkmauve.fr> <20230824131342.206784-1-linkmauve@linkmauve.fr> MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org From: Alexandre Courbot This prevents the charger from ever going over the current limit. Signed-off-by: Alexandre Courbot Signed-off-by: Emmanuel Gil Peyrot --- drivers/power/supply/bq24190_charger.c | 82 ++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/drivers/power/supply/bq24190_charger.c b/drivers/power/supply/bq24190_charger.c index a56122b39687..cc1bd87f4982 100644 --- a/drivers/power/supply/bq24190_charger.c +++ b/drivers/power/supply/bq24190_charger.c @@ -530,6 +530,79 @@ static int bq24190_set_otg_vbus(struct bq24190_dev_info *bdi, bool enable) } #ifdef CONFIG_REGULATOR +static int bq24190_set_charging_current(struct regulator_dev *dev, + int min_uA, int max_uA) +{ + struct bq24190_dev_info *bdi = rdev_get_drvdata(dev); + u8 ss_reg; + int in_current_limit; + int ret = 0; + + ret = bq24190_read(bdi, BQ24190_REG_SS, &ss_reg); + if (ret < 0) + goto error; + + if (max_uA == 0 && ss_reg != 0) + return ret; + + if (!(ss_reg & BQ24190_REG_SS_VBUS_STAT_MASK)) + in_current_limit = 500; + else + in_current_limit = max_uA / 1000; + + return bq24190_set_field_val(bdi, BQ24190_REG_ISC, + BQ24190_REG_ISC_IINLIM_MASK, + BQ24190_REG_ISC_IINLIM_SHIFT, + bq24190_isc_iinlim_values, + ARRAY_SIZE(bq24190_isc_iinlim_values), + in_current_limit); +error: + dev_err(bdi->dev, "Charger enable failed, err = %d\n", ret); + return ret; +} + +static const struct regulator_ops bq24190_chrg_ops = { + .set_current_limit = bq24190_set_charging_current, +}; + +static const struct regulator_desc bq24190_chrg_desc = { + .name = "charger", + .of_match = "charger", + .type = REGULATOR_CURRENT, + .owner = THIS_MODULE, + .ops = &bq24190_chrg_ops, +}; + +static const struct regulator_init_data bq24190_chrg_init_data = { + .constraints = { + .valid_ops_mask = REGULATOR_CHANGE_STATUS | REGULATOR_CHANGE_CURRENT, + .min_uA = 0, + .max_uA = 3000000, + }, +}; + +static int bq24190_register_chrg_regulator(struct bq24190_dev_info *bdi) +{ + struct bq24190_platform_data *pdata = bdi->dev->platform_data; + struct regulator_config cfg = { }; + struct regulator_dev *reg; + int ret = 0; + + cfg.dev = bdi->dev; + if (pdata && pdata->regulator_init_data) + cfg.init_data = pdata->regulator_init_data; + else + cfg.init_data = &bq24190_chrg_init_data; + cfg.driver_data = bdi; + reg = devm_regulator_register(bdi->dev, &bq24190_chrg_desc, &cfg); + if (IS_ERR(reg)) { + ret = PTR_ERR(reg); + dev_err(bdi->dev, "Can't register regulator: %d\n", ret); + } + + return ret; +} + static int bq24190_vbus_enable(struct regulator_dev *dev) { return bq24190_set_otg_vbus(rdev_get_drvdata(dev), true); @@ -611,6 +684,11 @@ static int bq24190_register_vbus_regulator(struct bq24190_dev_info *bdi) return ret; } #else +static int bq24190_register_chrg_regulator(struct bq24190_dev_info *bdi) +{ + return 0; +} + static int bq24190_register_vbus_regulator(struct bq24190_dev_info *bdi) { return 0; @@ -1879,6 +1957,10 @@ static int bq24190_probe(struct i2c_client *client) goto out_charger; } + ret = bq24190_register_chrg_regulator(bdi); + if (ret < 0) + goto out_charger; + ret = bq24190_register_vbus_regulator(bdi); if (ret < 0) goto out_charger;