From nobody Wed Oct 8 03:44:52 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4AF9E2E7BDC; Thu, 3 Jul 2025 11:32:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751542346; cv=none; b=TkC3MqI0hqMiw2ZlSNn5FIFZXVgWNBtnfwrivR8ys+Jz/Ac+aJoGIKkGOkHhI+jQHbBhktekj/mkH5reH3z/EarTGta+vg2aUXsDJEPvHYb0rHN95EzWC88Z8Z7HNcddTZSv4mG0rWIHoVi/ujbI6sIIg5R/OgJLvwuDRTeqNXk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751542346; c=relaxed/simple; bh=0+BrFq8UJUgrXrzTNW/WoFpuZ6X2firnB27vkFu+wfs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=eLWCieaHL3YiN+LqK3OT5aBn5AQ+iEcPUIe7bOUfb9BB3HnVHBsf9xLKut+G3o/x41UMY+TVtiOHRjfCx68JxMIfRQBn8T7nwbM7PScFCA7M7cjukfnLA/W+DD7wzWpElvnP2/tvcQjJTvY8Z3N7xqL0DQA0vc4t6nLyJ1eofqg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fO0oKpLI; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="fO0oKpLI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 14038C4CEEB; Thu, 3 Jul 2025 11:32:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751542345; bh=0+BrFq8UJUgrXrzTNW/WoFpuZ6X2firnB27vkFu+wfs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fO0oKpLIXupdZpDCPZDwAB7a9R6vua594b/SVSQtty2o5fqA4iFj7ekiBMF2JdhEE QvuEC5HDkwg3cBozvkQFTq6FkcVgyvVnrakAGjS/Mct9KIsgqj1+EiXjx54NMwo4Fs ql+71WayUQPU/PKISIFU1nuFZgPNH7KzP4pUqgGuUTg0ot15TYjIwCtBDkZVZ1o0fR adC3BDGW1HYt3vgTahc5Xzdl8jqWiS+VhFcWAVQqHK5szwsLCrp3HH1idZwx0QAuBn 3WbyiQy1KzlP6ew0myu952lfhelN/XrI1gYx9rszrPOqvGwG5qcvsTQ3wUAa29JZ4W sdBTzB4RY4LjA== From: Michael Walle To: Lee Jones , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Arnd Bergmann , Greg Kroah-Hartman , Linus Walleij , Liam Girdwood , Mark Brown , Julien Panis Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, Michael Walle Subject: [PATCH v3 7/8] regulator: tps6594-regulator: refactor variant descriptions Date: Thu, 3 Jul 2025 13:31:52 +0200 Message-Id: <20250703113153.2447110-8-mwalle@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250703113153.2447110-1-mwalle@kernel.org> References: <20250703113153.2447110-1-mwalle@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Instead of using conditionals or tri state operators throughout the .probe() provide a description per variant. This will make it much easier to add new variants later. While at it, make the variable naming more consistent. This patch is only compile-time tested. Signed-off-by: Michael Walle Acked-by: Mark Brown --- drivers/regulator/tps6594-regulator.c | 199 +++++++++++++++----------- 1 file changed, 112 insertions(+), 87 deletions(-) diff --git a/drivers/regulator/tps6594-regulator.c b/drivers/regulator/tps6= 594-regulator.c index 2c7c4df80695..39adb2db6de8 100644 --- a/drivers/regulator/tps6594-regulator.c +++ b/drivers/regulator/tps6594-regulator.c @@ -21,10 +21,6 @@ #define BUCK_NB 5 #define LDO_NB 4 #define MULTI_PHASE_NB 4 -/* TPS6593 and LP8764 supports OV, UV, SC, ILIM */ -#define REGS_INT_NB 4 -/* TPS65224 supports OV or UV */ -#define TPS65224_REGS_INT_NB 1 =20 enum tps6594_regulator_id { /* DCDC's */ @@ -192,7 +188,7 @@ static const struct regulator_ops tps6594_ldos_4_ops = =3D { .map_voltage =3D regulator_map_voltage_linear_range, }; =20 -static const struct regulator_desc buck_regs[] =3D { +static const struct regulator_desc tps6594_buck_regs[] =3D { TPS6594_REGULATOR("BUCK1", "buck1", TPS6594_BUCK_1, REGULATOR_VOLTAGE, tps6594_bucks_ops, TPS6594_MASK_BUCKS_VSET, TPS6594_REG_BUCKX_VOUT_1(0), @@ -549,6 +545,63 @@ static int tps6594_request_reg_irqs(struct platform_de= vice *pdev, return 0; } =20 +struct tps6594_regulator_desc { + const struct regulator_desc *multi_phase_regs; + unsigned int num_multi_phase_regs; + + const struct regulator_desc *buck_regs; + int num_buck_regs; + + const struct regulator_desc *ldo_regs; + int num_ldo_regs; + + const struct tps6594_regulator_irq_type **bucks_irq_types; + const struct tps6594_regulator_irq_type **ldos_irq_types; + int num_irq_types; + + const struct tps6594_regulator_irq_type *ext_irq_types; + int num_ext_irqs; +}; + +static const struct tps6594_regulator_desc tps65224_reg_desc =3D { + .multi_phase_regs =3D tps65224_multi_regs, + .num_multi_phase_regs =3D ARRAY_SIZE(tps65224_multi_regs), + .buck_regs =3D tps65224_buck_regs, + .num_buck_regs =3D ARRAY_SIZE(tps65224_buck_regs), + .ldo_regs =3D tps65224_ldo_regs, + .num_ldo_regs =3D ARRAY_SIZE(tps65224_ldo_regs), + .bucks_irq_types =3D tps65224_bucks_irq_types, + .ldos_irq_types =3D tps65224_ldos_irq_types, + .num_irq_types =3D 1, /* OV or UV */ + .ext_irq_types =3D tps65224_ext_regulator_irq_types, + .num_ext_irqs =3D ARRAY_SIZE(tps65224_ext_regulator_irq_types), +}; + +static const struct tps6594_regulator_desc tps6594_reg_desc =3D { + .multi_phase_regs =3D tps6594_multi_regs, + .num_multi_phase_regs =3D ARRAY_SIZE(tps6594_multi_regs), + .buck_regs =3D tps6594_buck_regs, + .num_buck_regs =3D ARRAY_SIZE(tps6594_buck_regs), + .ldo_regs =3D tps6594_ldo_regs, + .num_ldo_regs =3D ARRAY_SIZE(tps6594_ldo_regs), + .bucks_irq_types =3D tps6594_bucks_irq_types, + .ldos_irq_types =3D tps6594_ldos_irq_types, + .num_irq_types =3D 4, /* OV, UV, SC and ILIM */ + .ext_irq_types =3D tps6594_ext_regulator_irq_types, + .num_ext_irqs =3D 2, /* only VCCA OV and UV */ +}; + +static const struct tps6594_regulator_desc lp8764_reg_desc =3D { + .multi_phase_regs =3D tps6594_multi_regs, + .num_multi_phase_regs =3D ARRAY_SIZE(tps6594_multi_regs), + .buck_regs =3D tps6594_buck_regs, + .num_buck_regs =3D ARRAY_SIZE(tps6594_buck_regs), + .bucks_irq_types =3D tps6594_bucks_irq_types, + .num_irq_types =3D 4, /* OV, UV, SC and ILIM */ + .ext_irq_types =3D tps6594_ext_regulator_irq_types, + .num_ext_irqs =3D ARRAY_SIZE(tps6594_ext_regulator_irq_types), +}; + static int tps6594_regulator_probe(struct platform_device *pdev) { struct tps6594 *tps =3D dev_get_drvdata(pdev->dev.parent); @@ -559,38 +612,32 @@ static int tps6594_regulator_probe(struct platform_de= vice *pdev) struct tps6594_regulator_irq_data *irq_data; struct tps6594_ext_regulator_irq_data *irq_ext_reg_data; const struct tps6594_regulator_irq_type *irq_type; - const struct tps6594_regulator_irq_type *irq_types; bool buck_configured[BUCK_NB] =3D { false }; bool buck_multi[MULTI_PHASE_NB] =3D { false }; + const struct tps6594_regulator_desc *desc; + const struct regulator_desc *multi_regs; =20 const char *npname; int error, i, irq, multi; int irq_idx =3D 0; int buck_idx =3D 0; - int nr_ldo; - int nr_buck; - int nr_types; - unsigned int irq_count; - unsigned int multi_phase_cnt; size_t reg_irq_nb; - const struct tps6594_regulator_irq_type **bucks_irq_types; - const struct regulator_desc *multi_regs; - const struct tps6594_regulator_irq_type **ldos_irq_types; - const struct regulator_desc *ldo_regs; =20 - if (tps->chip_id =3D=3D TPS65224) { - bucks_irq_types =3D tps65224_bucks_irq_types; - multi_regs =3D tps65224_multi_regs; - ldos_irq_types =3D tps65224_ldos_irq_types; - ldo_regs =3D tps65224_ldo_regs; - multi_phase_cnt =3D ARRAY_SIZE(tps65224_multi_regs); - } else { - bucks_irq_types =3D tps6594_bucks_irq_types; - multi_regs =3D tps6594_multi_regs; - ldos_irq_types =3D tps6594_ldos_irq_types; - ldo_regs =3D tps6594_ldo_regs; - multi_phase_cnt =3D ARRAY_SIZE(tps6594_multi_regs); - } + switch (tps->chip_id) { + case TPS65224: + desc =3D &tps65224_reg_desc; + break; + case TPS6594: + case TPS6593: + desc =3D &tps6594_reg_desc; + break; + case LP8764: + desc =3D &lp8764_reg_desc; + break; + default: + dev_err(tps->dev, "unknown chip_id %lu\n", tps->chip_id); + return -EINVAL; + }; =20 enum { MULTI_BUCK12, @@ -611,13 +658,14 @@ static int tps6594_regulator_probe(struct platform_de= vice *pdev) * In case of Multiphase configuration, value should be defined for * buck_configured to avoid creating bucks for every buck in multiphase */ - for (multi =3D 0; multi < multi_phase_cnt; multi++) { - np =3D of_find_node_by_name(tps->dev->of_node, multi_regs[multi].supply_= name); + for (multi =3D 0; multi < desc->num_multi_phase_regs; multi++) { + multi_regs =3D &desc->multi_phase_regs[multi]; + np =3D of_find_node_by_name(tps->dev->of_node, multi_regs->supply_name); npname =3D of_node_full_name(np); np_pmic_parent =3D of_get_parent(of_get_parent(np)); if (of_node_cmp(of_node_full_name(np_pmic_parent), tps->dev->of_node->fu= ll_name)) continue; - if (strcmp(npname, multi_regs[multi].supply_name) =3D=3D 0) { + if (strcmp(npname, multi_regs->supply_name) =3D=3D 0) { switch (multi) { case MULTI_BUCK12: buck_multi[0] =3D true; @@ -650,28 +698,19 @@ static int tps6594_regulator_probe(struct platform_de= vice *pdev) } } =20 - if (tps->chip_id =3D=3D TPS65224) { - nr_buck =3D ARRAY_SIZE(tps65224_buck_regs); - nr_ldo =3D ARRAY_SIZE(tps65224_ldo_regs); - nr_types =3D TPS65224_REGS_INT_NB; - } else { - nr_buck =3D ARRAY_SIZE(buck_regs); - nr_ldo =3D (tps->chip_id =3D=3D LP8764) ? 0 : ARRAY_SIZE(tps6594_ldo_reg= s); - nr_types =3D REGS_INT_NB; - } - - reg_irq_nb =3D nr_types * (nr_buck + nr_ldo); + reg_irq_nb =3D desc->num_irq_types * (desc->num_buck_regs + desc->num_ldo= _regs); =20 irq_data =3D devm_kmalloc_array(tps->dev, reg_irq_nb, sizeof(struct tps6594_regulator_irq_data), GFP_KERNEL); if (!irq_data) return -ENOMEM; =20 - for (i =3D 0; i < multi_phase_cnt; i++) { + for (i =3D 0; i < desc->num_multi_phase_regs; i++) { if (!buck_multi[i]) continue; =20 - rdev =3D devm_regulator_register(&pdev->dev, &multi_regs[i], &config); + rdev =3D devm_regulator_register(&pdev->dev, &desc->multi_phase_regs[i], + &config); if (IS_ERR(rdev)) return dev_err_probe(tps->dev, PTR_ERR(rdev), "failed to register %s regulator\n", @@ -682,89 +721,74 @@ static int tps6594_regulator_probe(struct platform_de= vice *pdev) buck_idx =3D 2; =20 error =3D tps6594_request_reg_irqs(pdev, rdev, irq_data, - bucks_irq_types[buck_idx], - nr_types, &irq_idx); + desc->bucks_irq_types[buck_idx], + desc->num_irq_types, &irq_idx); if (error) return error; =20 error =3D tps6594_request_reg_irqs(pdev, rdev, irq_data, - bucks_irq_types[buck_idx + 1], - nr_types, &irq_idx); + desc->bucks_irq_types[buck_idx + 1], + desc->num_irq_types, &irq_idx); if (error) return error; =20 if (i =3D=3D MULTI_BUCK123 || i =3D=3D MULTI_BUCK1234) { error =3D tps6594_request_reg_irqs(pdev, rdev, irq_data, - bucks_irq_types[buck_idx + 2], - nr_types, &irq_idx); + desc->bucks_irq_types[buck_idx + 2], + desc->num_irq_types, + &irq_idx); if (error) return error; } if (i =3D=3D MULTI_BUCK1234) { error =3D tps6594_request_reg_irqs(pdev, rdev, irq_data, - bucks_irq_types[buck_idx + 3], - nr_types, &irq_idx); + desc->bucks_irq_types[buck_idx + 3], + desc->num_irq_types, + &irq_idx); if (error) return error; } } =20 - for (i =3D 0; i < nr_buck; i++) { + for (i =3D 0; i < desc->num_buck_regs; i++) { if (buck_configured[i]) continue; =20 - const struct regulator_desc *buck_cfg =3D (tps->chip_id =3D=3D TPS65224)= ? - tps65224_buck_regs : buck_regs; - - rdev =3D devm_regulator_register(&pdev->dev, &buck_cfg[i], &config); + rdev =3D devm_regulator_register(&pdev->dev, &desc->buck_regs[i], &confi= g); if (IS_ERR(rdev)) return dev_err_probe(tps->dev, PTR_ERR(rdev), "failed to register %s regulator\n", pdev->name); =20 error =3D tps6594_request_reg_irqs(pdev, rdev, irq_data, - bucks_irq_types[i], nr_types, &irq_idx); + desc->bucks_irq_types[i], + desc->num_irq_types, &irq_idx); if (error) return error; } =20 - /* LP8764 doesn't have LDO */ - if (tps->chip_id !=3D LP8764) { - for (i =3D 0; i < nr_ldo; i++) { - rdev =3D devm_regulator_register(&pdev->dev, &ldo_regs[i], &config); - if (IS_ERR(rdev)) - return dev_err_probe(tps->dev, PTR_ERR(rdev), - "failed to register %s regulator\n", - pdev->name); - - error =3D tps6594_request_reg_irqs(pdev, rdev, irq_data, - ldos_irq_types[i], nr_types, - &irq_idx); - if (error) - return error; - } - } + for (i =3D 0; i < desc->num_ldo_regs; i++) { + rdev =3D devm_regulator_register(&pdev->dev, &desc->ldo_regs[i], &config= ); + if (IS_ERR(rdev)) + return dev_err_probe(tps->dev, PTR_ERR(rdev), + "failed to register %s regulator\n", + pdev->name); =20 - if (tps->chip_id =3D=3D TPS65224) { - irq_types =3D tps65224_ext_regulator_irq_types; - irq_count =3D ARRAY_SIZE(tps65224_ext_regulator_irq_types); - } else { - irq_types =3D tps6594_ext_regulator_irq_types; - if (tps->chip_id =3D=3D LP8764) - irq_count =3D ARRAY_SIZE(tps6594_ext_regulator_irq_types); - else - /* TPS6593 supports only VCCA OV and UV */ - irq_count =3D 2; + error =3D tps6594_request_reg_irqs(pdev, rdev, irq_data, + desc->ldos_irq_types[i], + desc->num_irq_types, &irq_idx); + if (error) + return error; } =20 irq_ext_reg_data =3D devm_kmalloc_array(tps->dev, - irq_count, + desc->num_ext_irqs, sizeof(struct tps6594_ext_regulator_irq_data), GFP_KERNEL); if (!irq_ext_reg_data) return -ENOMEM; =20 - for (i =3D 0; i < irq_count; ++i) { - irq_type =3D &irq_types[i]; + for (i =3D 0; i < desc->num_ext_irqs; ++i) { + irq_type =3D &desc->ext_irq_types[i]; irq =3D platform_get_irq_byname(pdev, irq_type->irq_name); if (irq < 0) return -EINVAL; @@ -782,6 +806,7 @@ static int tps6594_regulator_probe(struct platform_devi= ce *pdev) "failed to request %s IRQ %d\n", irq_type->irq_name, irq); } + return 0; } =20 --=20 2.39.5