* [PATCH 1/2] regulator: dt-bindings: Add PM8150x compatibles
@ 2019-08-08 9:33 Vinod Koul
2019-08-08 9:33 ` [PATCH 2/2] regulator: qcom-rpmh: Add support for SM8150 Vinod Koul
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Vinod Koul @ 2019-08-08 9:33 UTC (permalink / raw)
To: Mark Brown
Cc: linux-arm-msm, Bjorn Andersson, Vinod Koul, Andy Gross,
Liam Girdwood, Rob Herring, Mark Rutland, linux-kernel,
devicetree
Add PM8150, PM8150L and PM8009 compatibles for these PMICs found
in some Qualcomm platforms.
Signed-off-by: Vinod Koul <vkoul@kernel.org>
---
.../devicetree/bindings/regulator/qcom,rpmh-regulator.txt | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt b/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt
index 14d2eee96b3d..1a9cab50503a 100644
--- a/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt
@@ -25,6 +25,9 @@ Supported regulator node names:
PM8998: smps1 - smps13, ldo1 - ldo28, lvs1 - lvs2
PMI8998: bob
PM8005: smps1 - smps4
+ PM8150: smps1 - smps10, ldo1 - ldo18
+ PM8150L: smps1 - smps8, ldo1 - ldo11, bob, flash, rgb
+ PM8009: smps1 - smps2, ld01 - ldo7
========================
First Level Nodes - PMIC
@@ -35,7 +38,10 @@ First Level Nodes - PMIC
Value type: <string>
Definition: Must be one of: "qcom,pm8998-rpmh-regulators",
"qcom,pmi8998-rpmh-regulators" or
- "qcom,pm8005-rpmh-regulators".
+ "qcom,pm8005-rpmh-regulators" or
+ "qcom,pm8150-rpmh-regulators" or
+ "qcom,pm8150l-rpmh-regulators" or
+ "qcom,pm8009-rpmh-regulators".
- qcom,pmic-id
Usage: required
--
2.20.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 2/2] regulator: qcom-rpmh: Add support for SM8150 2019-08-08 9:33 [PATCH 1/2] regulator: dt-bindings: Add PM8150x compatibles Vinod Koul @ 2019-08-08 9:33 ` Vinod Koul 2019-08-08 20:33 ` Applied "regulator: qcom-rpmh: Add support for SM8150" to the regulator tree Mark Brown 2019-08-09 3:32 ` [PATCH 2/2] regulator: qcom-rpmh: Add support for SM8150 Bjorn Andersson 2019-08-08 20:33 ` Applied "regulator: dt-bindings: Add PM8150x compatibles" to the regulator tree Mark Brown 2019-08-09 3:29 ` [PATCH 1/2] regulator: dt-bindings: Add PM8150x compatibles Bjorn Andersson 2 siblings, 2 replies; 8+ messages in thread From: Vinod Koul @ 2019-08-08 9:33 UTC (permalink / raw) To: Mark Brown Cc: linux-arm-msm, Bjorn Andersson, Vinod Koul, Andy Gross, Liam Girdwood, Rob Herring, Mark Rutland, linux-kernel, devicetree Add support from RPMH regulators found in SM8150 platform Signed-off-by: Vinod Koul <vkoul@kernel.org> --- drivers/regulator/qcom-rpmh-regulator.c | 147 ++++++++++++++++++++++++ 1 file changed, 147 insertions(+) diff --git a/drivers/regulator/qcom-rpmh-regulator.c b/drivers/regulator/qcom-rpmh-regulator.c index b2c2d01d1637..693ffec62f3e 100644 --- a/drivers/regulator/qcom-rpmh-regulator.c +++ b/drivers/regulator/qcom-rpmh-regulator.c @@ -637,6 +637,72 @@ static const struct rpmh_vreg_hw_data pmic4_lvs = { /* LVS hardware does not support voltage or mode configuration. */ }; +static const struct rpmh_vreg_hw_data pmic5_pldo = { + .regulator_type = VRM, + .ops = &rpmh_regulator_vrm_drms_ops, + .voltage_range = REGULATOR_LINEAR_RANGE(1504000, 0, 255, 8000), + .n_voltages = 256, + .hpm_min_load_uA = 10000, + .pmic_mode_map = pmic_mode_map_pmic4_ldo, + .of_map_mode = rpmh_regulator_pmic4_ldo_of_map_mode, +}; + +static const struct rpmh_vreg_hw_data pmic5_pldo_lv = { + .regulator_type = VRM, + .ops = &rpmh_regulator_vrm_drms_ops, + .voltage_range = REGULATOR_LINEAR_RANGE(1504000, 0, 62, 8000), + .n_voltages = 63, + .hpm_min_load_uA = 10000, + .pmic_mode_map = pmic_mode_map_pmic4_ldo, + .of_map_mode = rpmh_regulator_pmic4_ldo_of_map_mode, +}; + +static const struct rpmh_vreg_hw_data pmic5_nldo = { + .regulator_type = VRM, + .ops = &rpmh_regulator_vrm_drms_ops, + .voltage_range = REGULATOR_LINEAR_RANGE(320000, 0, 123, 8000), + .n_voltages = 124, + .hpm_min_load_uA = 30000, + .pmic_mode_map = pmic_mode_map_pmic4_ldo, + .of_map_mode = rpmh_regulator_pmic4_ldo_of_map_mode, +}; + +static const struct rpmh_vreg_hw_data pmic5_hfsmps510 = { + .regulator_type = VRM, + .ops = &rpmh_regulator_vrm_ops, + .voltage_range = REGULATOR_LINEAR_RANGE(320000, 0, 215, 8000), + .n_voltages = 216, + .pmic_mode_map = pmic_mode_map_pmic4_smps, + .of_map_mode = rpmh_regulator_pmic4_smps_of_map_mode, +}; + +static const struct rpmh_vreg_hw_data pmic5_ftsmps510 = { + .regulator_type = VRM, + .ops = &rpmh_regulator_vrm_ops, + .voltage_range = REGULATOR_LINEAR_RANGE(300000, 0, 263, 4000), + .n_voltages = 264, + .pmic_mode_map = pmic_mode_map_pmic4_smps, + .of_map_mode = rpmh_regulator_pmic4_smps_of_map_mode, +}; + +static const struct rpmh_vreg_hw_data pmic5_hfsmps515 = { + .regulator_type = VRM, + .ops = &rpmh_regulator_vrm_ops, + .voltage_range = REGULATOR_LINEAR_RANGE(2800000, 0, 4, 1600), + .n_voltages = 5, + .pmic_mode_map = pmic_mode_map_pmic4_smps, + .of_map_mode = rpmh_regulator_pmic4_smps_of_map_mode, +}; + +static const struct rpmh_vreg_hw_data pmic5_bob = { + .regulator_type = VRM, + .ops = &rpmh_regulator_vrm_bypass_ops, + .voltage_range = REGULATOR_LINEAR_RANGE(300000, 0, 135, 32000), + .n_voltages = 135, + .pmic_mode_map = pmic_mode_map_pmic4_bob, + .of_map_mode = rpmh_regulator_pmic4_bob_of_map_mode, +}; + #define RPMH_VREG(_name, _resource_name, _hw_data, _supply_name) \ { \ .name = _name, \ @@ -705,6 +771,75 @@ static const struct rpmh_vreg_init_data pm8005_vreg_data[] = { {}, }; +static const struct rpmh_vreg_init_data pm8150_vreg_data[] = { + RPMH_VREG("smps1", "smp%s1", &pmic5_ftsmps510, "vdd-s1"), + RPMH_VREG("smps2", "smp%s2", &pmic5_ftsmps510, "vdd-s2"), + RPMH_VREG("smps3", "smp%s3", &pmic5_ftsmps510, "vdd-s3"), + RPMH_VREG("smps4", "smp%s4", &pmic5_hfsmps510, "vdd-s4"), + RPMH_VREG("smps5", "smp%s5", &pmic5_hfsmps510, "vdd-s5"), + RPMH_VREG("smps6", "smp%s6", &pmic5_ftsmps510, "vdd-s6"), + RPMH_VREG("smps7", "smp%s7", &pmic5_ftsmps510, "vdd-s7"), + RPMH_VREG("smps8", "smp%s8", &pmic5_ftsmps510, "vdd-s8"), + RPMH_VREG("smps9", "smp%s9", &pmic5_ftsmps510, "vdd-s9"), + RPMH_VREG("smps10", "smp%s10", &pmic5_ftsmps510, "vdd-s10"), + RPMH_VREG("ldo1", "ldo%s1", &pmic5_nldo, "vdd-l1-l8-l11"), + RPMH_VREG("ldo2", "ldo%s2", &pmic5_pldo, "vdd-l2-l10"), + RPMH_VREG("ldo3", "ldo%s3", &pmic5_nldo, "vdd-l3-l4-l5-l18"), + RPMH_VREG("ldo4", "ldo%s4", &pmic5_nldo, "vdd-l3-l4-l5-l18"), + RPMH_VREG("ldo5", "ldo%s5", &pmic5_nldo, "vdd-l3-l4-l5-l18"), + RPMH_VREG("ldo6", "ldo%s6", &pmic5_nldo, "vdd-l6-l9"), + RPMH_VREG("ldo7", "ldo%s7", &pmic5_pldo, "vdd-l7-l12-l14-l15"), + RPMH_VREG("ldo8", "ldo%s8", &pmic5_nldo, "vdd-l1-l8-l11"), + RPMH_VREG("ldo9", "ldo%s9", &pmic5_nldo, "vdd-l6-l9"), + RPMH_VREG("ldo10", "ldo%s10", &pmic5_pldo, "vdd-l2-l10"), + RPMH_VREG("ldo11", "ldo%s11", &pmic5_nldo, "vdd-l1-l8-l11"), + RPMH_VREG("ldo12", "ldo%s12", &pmic5_pldo_lv, "vdd-l7-l12-l14-l15"), + RPMH_VREG("ldo13", "ldo%s13", &pmic5_pldo, "vdd-l13-l6-l17"), + RPMH_VREG("ldo14", "ldo%s14", &pmic5_pldo_lv, "vdd-l7-l12-l14-l15"), + RPMH_VREG("ldo15", "ldo%s15", &pmic5_pldo_lv, "vdd-l7-l12-l14-l15"), + RPMH_VREG("ldo16", "ldo%s16", &pmic5_pldo, "vdd-l13-l6-l17"), + RPMH_VREG("ldo17", "ldo%s17", &pmic5_pldo, "vdd-l13-l6-l17"), + RPMH_VREG("ldo18", "ldo%s18", &pmic5_nldo, "vdd-l3-l4-l5-l18"), + {}, +}; + +static const struct rpmh_vreg_init_data pm8150l_vreg_data[] = { + RPMH_VREG("smps1", "smp%s1", &pmic5_ftsmps510, "vdd-s1"), + RPMH_VREG("smps2", "smp%s2", &pmic5_ftsmps510, "vdd-s2"), + RPMH_VREG("smps3", "smp%s3", &pmic5_ftsmps510, "vdd-s3"), + RPMH_VREG("smps4", "smp%s4", &pmic5_ftsmps510, "vdd-s4"), + RPMH_VREG("smps5", "smp%s5", &pmic5_ftsmps510, "vdd-s5"), + RPMH_VREG("smps6", "smp%s6", &pmic5_ftsmps510, "vdd-s6"), + RPMH_VREG("smps7", "smp%s7", &pmic5_ftsmps510, "vdd-s7"), + RPMH_VREG("smps8", "smp%s8", &pmic5_hfsmps510, "vdd-s8"), + RPMH_VREG("ldo1", "ldo%s1", &pmic5_pldo_lv, "vdd-l1-l8"), + RPMH_VREG("ldo2", "ldo%s2", &pmic5_nldo, "vdd-l2-l3"), + RPMH_VREG("ldo3", "ldo%s3", &pmic5_nldo, "vdd-l2-l3"), + RPMH_VREG("ldo4", "ldo%s4", &pmic5_pldo, "vdd-l4-l5-l6"), + RPMH_VREG("ldo5", "ldo%s5", &pmic5_pldo, "vdd-l4-l5-l6"), + RPMH_VREG("ldo6", "ldo%s6", &pmic5_pldo, "vdd-l4-l5-l6"), + RPMH_VREG("ldo7", "ldo%s7", &pmic5_pldo, "vdd-l7-l11"), + RPMH_VREG("ldo8", "ldo%s8", &pmic5_pldo_lv, "vdd-l1-l8-l11"), + RPMH_VREG("ldo9", "ldo%s9", &pmic5_pldo, "vdd-l9-l10"), + RPMH_VREG("ldo10", "ldo%s10", &pmic5_pldo, "vdd-l9-l10"), + RPMH_VREG("ldo11", "ldo%s11", &pmic5_pldo, "vdd-l7-l11"), + RPMH_VREG("bob", "bob%s1", &pmic5_bob, "vdd-bob"), + {}, +}; + +static const struct rpmh_vreg_init_data pm8009_vreg_data[] = { + RPMH_VREG("smps1", "smp%s1", &pmic5_hfsmps510, "vdd-s1"), + RPMH_VREG("smps2", "smp%s2", &pmic5_hfsmps515, "vdd-s2"), + RPMH_VREG("ldo1", "ldo%s1", &pmic5_nldo, "vdd-l1"), + RPMH_VREG("ldo2", "ldo%s2", &pmic5_nldo, "vdd-l2"), + RPMH_VREG("ldo3", "ldo%s3", &pmic5_nldo, "vdd-l3"), + RPMH_VREG("ldo4", "ldo%s4", &pmic5_nldo, "vdd-l4"), + RPMH_VREG("ldo5", "ldo%s5", &pmic5_pldo, "vdd-l5-l6"), + RPMH_VREG("ldo6", "ldo%s6", &pmic5_pldo, "vdd-l5-l6"), + RPMH_VREG("ldo7", "ldo%s6", &pmic5_pldo_lv, "vdd-l7"), + {}, +}; + static int rpmh_regulator_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -755,6 +890,18 @@ static const struct of_device_id rpmh_regulator_match_table[] = { .compatible = "qcom,pm8005-rpmh-regulators", .data = pm8005_vreg_data, }, + { + .compatible = "qcom,pm8150-rpmh-regulators", + .data = pm8150_vreg_data, + }, + { + .compatible = "qcom,pm8150l-rpmh-regulators", + .data = pm8150l_vreg_data, + }, + { + .compatible = "qcom,pm8009-rpmh-regulators", + .data = pm8009_vreg_data, + }, {} }; MODULE_DEVICE_TABLE(of, rpmh_regulator_match_table); -- 2.20.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Applied "regulator: qcom-rpmh: Add support for SM8150" to the regulator tree 2019-08-08 9:33 ` [PATCH 2/2] regulator: qcom-rpmh: Add support for SM8150 Vinod Koul @ 2019-08-08 20:33 ` Mark Brown 2019-08-09 3:32 ` [PATCH 2/2] regulator: qcom-rpmh: Add support for SM8150 Bjorn Andersson 1 sibling, 0 replies; 8+ messages in thread From: Mark Brown @ 2019-08-08 20:33 UTC (permalink / raw) To: Vinod Koul Cc: Andy Gross, Bjorn Andersson, devicetree, Liam Girdwood, linux-arm-msm, linux-kernel, Mark Brown, Mark Rutland, Rob Herring The patch regulator: qcom-rpmh: Add support for SM8150 has been applied to the regulator tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-5.4 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark From 06369bcc15a1620930a17fb35e26477504cd2255 Mon Sep 17 00:00:00 2001 From: Vinod Koul <vkoul@kernel.org> Date: Thu, 8 Aug 2019 15:03:43 +0530 Subject: [PATCH] regulator: qcom-rpmh: Add support for SM8150 Add support from RPMH regulators found in SM8150 platform Signed-off-by: Vinod Koul <vkoul@kernel.org> Link: https://lore.kernel.org/r/20190808093343.5600-2-vkoul@kernel.org Signed-off-by: Mark Brown <broonie@kernel.org> --- drivers/regulator/qcom-rpmh-regulator.c | 147 ++++++++++++++++++++++++ 1 file changed, 147 insertions(+) diff --git a/drivers/regulator/qcom-rpmh-regulator.c b/drivers/regulator/qcom-rpmh-regulator.c index b2c2d01d1637..693ffec62f3e 100644 --- a/drivers/regulator/qcom-rpmh-regulator.c +++ b/drivers/regulator/qcom-rpmh-regulator.c @@ -637,6 +637,72 @@ static const struct rpmh_vreg_hw_data pmic4_lvs = { /* LVS hardware does not support voltage or mode configuration. */ }; +static const struct rpmh_vreg_hw_data pmic5_pldo = { + .regulator_type = VRM, + .ops = &rpmh_regulator_vrm_drms_ops, + .voltage_range = REGULATOR_LINEAR_RANGE(1504000, 0, 255, 8000), + .n_voltages = 256, + .hpm_min_load_uA = 10000, + .pmic_mode_map = pmic_mode_map_pmic4_ldo, + .of_map_mode = rpmh_regulator_pmic4_ldo_of_map_mode, +}; + +static const struct rpmh_vreg_hw_data pmic5_pldo_lv = { + .regulator_type = VRM, + .ops = &rpmh_regulator_vrm_drms_ops, + .voltage_range = REGULATOR_LINEAR_RANGE(1504000, 0, 62, 8000), + .n_voltages = 63, + .hpm_min_load_uA = 10000, + .pmic_mode_map = pmic_mode_map_pmic4_ldo, + .of_map_mode = rpmh_regulator_pmic4_ldo_of_map_mode, +}; + +static const struct rpmh_vreg_hw_data pmic5_nldo = { + .regulator_type = VRM, + .ops = &rpmh_regulator_vrm_drms_ops, + .voltage_range = REGULATOR_LINEAR_RANGE(320000, 0, 123, 8000), + .n_voltages = 124, + .hpm_min_load_uA = 30000, + .pmic_mode_map = pmic_mode_map_pmic4_ldo, + .of_map_mode = rpmh_regulator_pmic4_ldo_of_map_mode, +}; + +static const struct rpmh_vreg_hw_data pmic5_hfsmps510 = { + .regulator_type = VRM, + .ops = &rpmh_regulator_vrm_ops, + .voltage_range = REGULATOR_LINEAR_RANGE(320000, 0, 215, 8000), + .n_voltages = 216, + .pmic_mode_map = pmic_mode_map_pmic4_smps, + .of_map_mode = rpmh_regulator_pmic4_smps_of_map_mode, +}; + +static const struct rpmh_vreg_hw_data pmic5_ftsmps510 = { + .regulator_type = VRM, + .ops = &rpmh_regulator_vrm_ops, + .voltage_range = REGULATOR_LINEAR_RANGE(300000, 0, 263, 4000), + .n_voltages = 264, + .pmic_mode_map = pmic_mode_map_pmic4_smps, + .of_map_mode = rpmh_regulator_pmic4_smps_of_map_mode, +}; + +static const struct rpmh_vreg_hw_data pmic5_hfsmps515 = { + .regulator_type = VRM, + .ops = &rpmh_regulator_vrm_ops, + .voltage_range = REGULATOR_LINEAR_RANGE(2800000, 0, 4, 1600), + .n_voltages = 5, + .pmic_mode_map = pmic_mode_map_pmic4_smps, + .of_map_mode = rpmh_regulator_pmic4_smps_of_map_mode, +}; + +static const struct rpmh_vreg_hw_data pmic5_bob = { + .regulator_type = VRM, + .ops = &rpmh_regulator_vrm_bypass_ops, + .voltage_range = REGULATOR_LINEAR_RANGE(300000, 0, 135, 32000), + .n_voltages = 135, + .pmic_mode_map = pmic_mode_map_pmic4_bob, + .of_map_mode = rpmh_regulator_pmic4_bob_of_map_mode, +}; + #define RPMH_VREG(_name, _resource_name, _hw_data, _supply_name) \ { \ .name = _name, \ @@ -705,6 +771,75 @@ static const struct rpmh_vreg_init_data pm8005_vreg_data[] = { {}, }; +static const struct rpmh_vreg_init_data pm8150_vreg_data[] = { + RPMH_VREG("smps1", "smp%s1", &pmic5_ftsmps510, "vdd-s1"), + RPMH_VREG("smps2", "smp%s2", &pmic5_ftsmps510, "vdd-s2"), + RPMH_VREG("smps3", "smp%s3", &pmic5_ftsmps510, "vdd-s3"), + RPMH_VREG("smps4", "smp%s4", &pmic5_hfsmps510, "vdd-s4"), + RPMH_VREG("smps5", "smp%s5", &pmic5_hfsmps510, "vdd-s5"), + RPMH_VREG("smps6", "smp%s6", &pmic5_ftsmps510, "vdd-s6"), + RPMH_VREG("smps7", "smp%s7", &pmic5_ftsmps510, "vdd-s7"), + RPMH_VREG("smps8", "smp%s8", &pmic5_ftsmps510, "vdd-s8"), + RPMH_VREG("smps9", "smp%s9", &pmic5_ftsmps510, "vdd-s9"), + RPMH_VREG("smps10", "smp%s10", &pmic5_ftsmps510, "vdd-s10"), + RPMH_VREG("ldo1", "ldo%s1", &pmic5_nldo, "vdd-l1-l8-l11"), + RPMH_VREG("ldo2", "ldo%s2", &pmic5_pldo, "vdd-l2-l10"), + RPMH_VREG("ldo3", "ldo%s3", &pmic5_nldo, "vdd-l3-l4-l5-l18"), + RPMH_VREG("ldo4", "ldo%s4", &pmic5_nldo, "vdd-l3-l4-l5-l18"), + RPMH_VREG("ldo5", "ldo%s5", &pmic5_nldo, "vdd-l3-l4-l5-l18"), + RPMH_VREG("ldo6", "ldo%s6", &pmic5_nldo, "vdd-l6-l9"), + RPMH_VREG("ldo7", "ldo%s7", &pmic5_pldo, "vdd-l7-l12-l14-l15"), + RPMH_VREG("ldo8", "ldo%s8", &pmic5_nldo, "vdd-l1-l8-l11"), + RPMH_VREG("ldo9", "ldo%s9", &pmic5_nldo, "vdd-l6-l9"), + RPMH_VREG("ldo10", "ldo%s10", &pmic5_pldo, "vdd-l2-l10"), + RPMH_VREG("ldo11", "ldo%s11", &pmic5_nldo, "vdd-l1-l8-l11"), + RPMH_VREG("ldo12", "ldo%s12", &pmic5_pldo_lv, "vdd-l7-l12-l14-l15"), + RPMH_VREG("ldo13", "ldo%s13", &pmic5_pldo, "vdd-l13-l6-l17"), + RPMH_VREG("ldo14", "ldo%s14", &pmic5_pldo_lv, "vdd-l7-l12-l14-l15"), + RPMH_VREG("ldo15", "ldo%s15", &pmic5_pldo_lv, "vdd-l7-l12-l14-l15"), + RPMH_VREG("ldo16", "ldo%s16", &pmic5_pldo, "vdd-l13-l6-l17"), + RPMH_VREG("ldo17", "ldo%s17", &pmic5_pldo, "vdd-l13-l6-l17"), + RPMH_VREG("ldo18", "ldo%s18", &pmic5_nldo, "vdd-l3-l4-l5-l18"), + {}, +}; + +static const struct rpmh_vreg_init_data pm8150l_vreg_data[] = { + RPMH_VREG("smps1", "smp%s1", &pmic5_ftsmps510, "vdd-s1"), + RPMH_VREG("smps2", "smp%s2", &pmic5_ftsmps510, "vdd-s2"), + RPMH_VREG("smps3", "smp%s3", &pmic5_ftsmps510, "vdd-s3"), + RPMH_VREG("smps4", "smp%s4", &pmic5_ftsmps510, "vdd-s4"), + RPMH_VREG("smps5", "smp%s5", &pmic5_ftsmps510, "vdd-s5"), + RPMH_VREG("smps6", "smp%s6", &pmic5_ftsmps510, "vdd-s6"), + RPMH_VREG("smps7", "smp%s7", &pmic5_ftsmps510, "vdd-s7"), + RPMH_VREG("smps8", "smp%s8", &pmic5_hfsmps510, "vdd-s8"), + RPMH_VREG("ldo1", "ldo%s1", &pmic5_pldo_lv, "vdd-l1-l8"), + RPMH_VREG("ldo2", "ldo%s2", &pmic5_nldo, "vdd-l2-l3"), + RPMH_VREG("ldo3", "ldo%s3", &pmic5_nldo, "vdd-l2-l3"), + RPMH_VREG("ldo4", "ldo%s4", &pmic5_pldo, "vdd-l4-l5-l6"), + RPMH_VREG("ldo5", "ldo%s5", &pmic5_pldo, "vdd-l4-l5-l6"), + RPMH_VREG("ldo6", "ldo%s6", &pmic5_pldo, "vdd-l4-l5-l6"), + RPMH_VREG("ldo7", "ldo%s7", &pmic5_pldo, "vdd-l7-l11"), + RPMH_VREG("ldo8", "ldo%s8", &pmic5_pldo_lv, "vdd-l1-l8-l11"), + RPMH_VREG("ldo9", "ldo%s9", &pmic5_pldo, "vdd-l9-l10"), + RPMH_VREG("ldo10", "ldo%s10", &pmic5_pldo, "vdd-l9-l10"), + RPMH_VREG("ldo11", "ldo%s11", &pmic5_pldo, "vdd-l7-l11"), + RPMH_VREG("bob", "bob%s1", &pmic5_bob, "vdd-bob"), + {}, +}; + +static const struct rpmh_vreg_init_data pm8009_vreg_data[] = { + RPMH_VREG("smps1", "smp%s1", &pmic5_hfsmps510, "vdd-s1"), + RPMH_VREG("smps2", "smp%s2", &pmic5_hfsmps515, "vdd-s2"), + RPMH_VREG("ldo1", "ldo%s1", &pmic5_nldo, "vdd-l1"), + RPMH_VREG("ldo2", "ldo%s2", &pmic5_nldo, "vdd-l2"), + RPMH_VREG("ldo3", "ldo%s3", &pmic5_nldo, "vdd-l3"), + RPMH_VREG("ldo4", "ldo%s4", &pmic5_nldo, "vdd-l4"), + RPMH_VREG("ldo5", "ldo%s5", &pmic5_pldo, "vdd-l5-l6"), + RPMH_VREG("ldo6", "ldo%s6", &pmic5_pldo, "vdd-l5-l6"), + RPMH_VREG("ldo7", "ldo%s6", &pmic5_pldo_lv, "vdd-l7"), + {}, +}; + static int rpmh_regulator_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -755,6 +890,18 @@ static const struct of_device_id rpmh_regulator_match_table[] = { .compatible = "qcom,pm8005-rpmh-regulators", .data = pm8005_vreg_data, }, + { + .compatible = "qcom,pm8150-rpmh-regulators", + .data = pm8150_vreg_data, + }, + { + .compatible = "qcom,pm8150l-rpmh-regulators", + .data = pm8150l_vreg_data, + }, + { + .compatible = "qcom,pm8009-rpmh-regulators", + .data = pm8009_vreg_data, + }, {} }; MODULE_DEVICE_TABLE(of, rpmh_regulator_match_table); -- 2.20.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] regulator: qcom-rpmh: Add support for SM8150 2019-08-08 9:33 ` [PATCH 2/2] regulator: qcom-rpmh: Add support for SM8150 Vinod Koul 2019-08-08 20:33 ` Applied "regulator: qcom-rpmh: Add support for SM8150" to the regulator tree Mark Brown @ 2019-08-09 3:32 ` Bjorn Andersson 2019-08-09 4:44 ` Vinod Koul 1 sibling, 1 reply; 8+ messages in thread From: Bjorn Andersson @ 2019-08-09 3:32 UTC (permalink / raw) To: Vinod Koul Cc: Mark Brown, linux-arm-msm, Andy Gross, Liam Girdwood, Rob Herring, Mark Rutland, linux-kernel, devicetree On Thu 08 Aug 02:33 PDT 2019, Vinod Koul wrote: > diff --git a/drivers/regulator/qcom-rpmh-regulator.c b/drivers/regulator/qcom-rpmh-regulator.c [..] > +static const struct rpmh_vreg_hw_data pmic5_bob = { > + .regulator_type = VRM, > + .ops = &rpmh_regulator_vrm_bypass_ops, > + .voltage_range = REGULATOR_LINEAR_RANGE(300000, 0, 135, 32000), > + .n_voltages = 135, There are 136 voltages in [0,135] > + .pmic_mode_map = pmic_mode_map_pmic4_bob, > + .of_map_mode = rpmh_regulator_pmic4_bob_of_map_mode, > +}; > + [..] > @@ -755,6 +890,18 @@ static const struct of_device_id rpmh_regulator_match_table[] = { > .compatible = "qcom,pm8005-rpmh-regulators", > .data = pm8005_vreg_data, > }, > + { > + .compatible = "qcom,pm8150-rpmh-regulators", > + .data = pm8150_vreg_data, > + }, > + { > + .compatible = "qcom,pm8150l-rpmh-regulators", > + .data = pm8150l_vreg_data, > + }, > + { > + .compatible = "qcom,pm8009-rpmh-regulators", > + .data = pm8009_vreg_data, > + }, Sort order... > {} > }; > MODULE_DEVICE_TABLE(of, rpmh_regulator_match_table); Apart from these nits this looks good. Regards, Bjorn ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] regulator: qcom-rpmh: Add support for SM8150 2019-08-09 3:32 ` [PATCH 2/2] regulator: qcom-rpmh: Add support for SM8150 Bjorn Andersson @ 2019-08-09 4:44 ` Vinod Koul 0 siblings, 0 replies; 8+ messages in thread From: Vinod Koul @ 2019-08-09 4:44 UTC (permalink / raw) To: Bjorn Andersson Cc: Mark Brown, linux-arm-msm, Andy Gross, Liam Girdwood, Rob Herring, Mark Rutland, linux-kernel, devicetree On 08-08-19, 20:32, Bjorn Andersson wrote: > On Thu 08 Aug 02:33 PDT 2019, Vinod Koul wrote: > > diff --git a/drivers/regulator/qcom-rpmh-regulator.c b/drivers/regulator/qcom-rpmh-regulator.c > [..] > > +static const struct rpmh_vreg_hw_data pmic5_bob = { > > + .regulator_type = VRM, > > + .ops = &rpmh_regulator_vrm_bypass_ops, > > + .voltage_range = REGULATOR_LINEAR_RANGE(300000, 0, 135, 32000), > > + .n_voltages = 135, > > There are 136 voltages in [0,135] Oops, will send an update > > > + .pmic_mode_map = pmic_mode_map_pmic4_bob, > > + .of_map_mode = rpmh_regulator_pmic4_bob_of_map_mode, > > +}; > > + > [..] > > @@ -755,6 +890,18 @@ static const struct of_device_id rpmh_regulator_match_table[] = { > > .compatible = "qcom,pm8005-rpmh-regulators", > > .data = pm8005_vreg_data, > > }, > > + { > > + .compatible = "qcom,pm8150-rpmh-regulators", > > + .data = pm8150_vreg_data, > > + }, > > + { > > + .compatible = "qcom,pm8150l-rpmh-regulators", > > + .data = pm8150l_vreg_data, > > + }, > > + { > > + .compatible = "qcom,pm8009-rpmh-regulators", > > + .data = pm8009_vreg_data, > > + }, > > Sort order... Yes will sort all entries. > > {} > > }; > > MODULE_DEVICE_TABLE(of, rpmh_regulator_match_table); > > Apart from these nits this looks good. Thanks :) -- ~Vinod ^ permalink raw reply [flat|nested] 8+ messages in thread
* Applied "regulator: dt-bindings: Add PM8150x compatibles" to the regulator tree 2019-08-08 9:33 [PATCH 1/2] regulator: dt-bindings: Add PM8150x compatibles Vinod Koul 2019-08-08 9:33 ` [PATCH 2/2] regulator: qcom-rpmh: Add support for SM8150 Vinod Koul @ 2019-08-08 20:33 ` Mark Brown 2019-08-09 3:29 ` [PATCH 1/2] regulator: dt-bindings: Add PM8150x compatibles Bjorn Andersson 2 siblings, 0 replies; 8+ messages in thread From: Mark Brown @ 2019-08-08 20:33 UTC (permalink / raw) To: Vinod Koul Cc: Andy Gross, Bjorn Andersson, devicetree, Liam Girdwood, linux-arm-msm, linux-kernel, Mark Brown, Mark Rutland, Rob Herring The patch regulator: dt-bindings: Add PM8150x compatibles has been applied to the regulator tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-5.4 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark From d566aae1c80d9be2276057b3236c68bdcc5b3254 Mon Sep 17 00:00:00 2001 From: Vinod Koul <vkoul@kernel.org> Date: Thu, 8 Aug 2019 15:03:42 +0530 Subject: [PATCH] regulator: dt-bindings: Add PM8150x compatibles Add PM8150, PM8150L and PM8009 compatibles for these PMICs found in some Qualcomm platforms. Signed-off-by: Vinod Koul <vkoul@kernel.org> Link: https://lore.kernel.org/r/20190808093343.5600-1-vkoul@kernel.org Signed-off-by: Mark Brown <broonie@kernel.org> --- .../devicetree/bindings/regulator/qcom,rpmh-regulator.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt b/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt index 14d2eee96b3d..1a9cab50503a 100644 --- a/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt +++ b/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt @@ -25,6 +25,9 @@ Supported regulator node names: PM8998: smps1 - smps13, ldo1 - ldo28, lvs1 - lvs2 PMI8998: bob PM8005: smps1 - smps4 + PM8150: smps1 - smps10, ldo1 - ldo18 + PM8150L: smps1 - smps8, ldo1 - ldo11, bob, flash, rgb + PM8009: smps1 - smps2, ld01 - ldo7 ======================== First Level Nodes - PMIC @@ -35,7 +38,10 @@ First Level Nodes - PMIC Value type: <string> Definition: Must be one of: "qcom,pm8998-rpmh-regulators", "qcom,pmi8998-rpmh-regulators" or - "qcom,pm8005-rpmh-regulators". + "qcom,pm8005-rpmh-regulators" or + "qcom,pm8150-rpmh-regulators" or + "qcom,pm8150l-rpmh-regulators" or + "qcom,pm8009-rpmh-regulators". - qcom,pmic-id Usage: required -- 2.20.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] regulator: dt-bindings: Add PM8150x compatibles 2019-08-08 9:33 [PATCH 1/2] regulator: dt-bindings: Add PM8150x compatibles Vinod Koul 2019-08-08 9:33 ` [PATCH 2/2] regulator: qcom-rpmh: Add support for SM8150 Vinod Koul 2019-08-08 20:33 ` Applied "regulator: dt-bindings: Add PM8150x compatibles" to the regulator tree Mark Brown @ 2019-08-09 3:29 ` Bjorn Andersson 2019-08-09 4:43 ` Vinod Koul 2 siblings, 1 reply; 8+ messages in thread From: Bjorn Andersson @ 2019-08-09 3:29 UTC (permalink / raw) To: Vinod Koul Cc: Mark Brown, linux-arm-msm, Andy Gross, Liam Girdwood, Rob Herring, Mark Rutland, linux-kernel, devicetree On Thu 08 Aug 02:33 PDT 2019, Vinod Koul wrote: > Add PM8150, PM8150L and PM8009 compatibles for these PMICs found > in some Qualcomm platforms. > > Signed-off-by: Vinod Koul <vkoul@kernel.org> > --- > .../devicetree/bindings/regulator/qcom,rpmh-regulator.txt | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt b/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt > index 14d2eee96b3d..1a9cab50503a 100644 > --- a/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt > +++ b/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt > @@ -25,6 +25,9 @@ Supported regulator node names: > PM8998: smps1 - smps13, ldo1 - ldo28, lvs1 - lvs2 > PMI8998: bob > PM8005: smps1 - smps4 > + PM8150: smps1 - smps10, ldo1 - ldo18 > + PM8150L: smps1 - smps8, ldo1 - ldo11, bob, flash, rgb > + PM8009: smps1 - smps2, ld01 - ldo7 Please maintain the sort order. Apart from that Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> Regards, Bjorn > > ======================== > First Level Nodes - PMIC > @@ -35,7 +38,10 @@ First Level Nodes - PMIC > Value type: <string> > Definition: Must be one of: "qcom,pm8998-rpmh-regulators", > "qcom,pmi8998-rpmh-regulators" or > - "qcom,pm8005-rpmh-regulators". > + "qcom,pm8005-rpmh-regulators" or > + "qcom,pm8150-rpmh-regulators" or > + "qcom,pm8150l-rpmh-regulators" or > + "qcom,pm8009-rpmh-regulators". > > - qcom,pmic-id > Usage: required > -- > 2.20.1 > ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] regulator: dt-bindings: Add PM8150x compatibles 2019-08-09 3:29 ` [PATCH 1/2] regulator: dt-bindings: Add PM8150x compatibles Bjorn Andersson @ 2019-08-09 4:43 ` Vinod Koul 0 siblings, 0 replies; 8+ messages in thread From: Vinod Koul @ 2019-08-09 4:43 UTC (permalink / raw) To: Bjorn Andersson Cc: Mark Brown, linux-arm-msm, Andy Gross, Liam Girdwood, Rob Herring, Mark Rutland, linux-kernel, devicetree On 08-08-19, 20:29, Bjorn Andersson wrote: > On Thu 08 Aug 02:33 PDT 2019, Vinod Koul wrote: > > > Add PM8150, PM8150L and PM8009 compatibles for these PMICs found > > in some Qualcomm platforms. > > > > Signed-off-by: Vinod Koul <vkoul@kernel.org> > > --- > > .../devicetree/bindings/regulator/qcom,rpmh-regulator.txt | 8 +++++++- > > 1 file changed, 7 insertions(+), 1 deletion(-) > > > > diff --git a/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt b/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt > > index 14d2eee96b3d..1a9cab50503a 100644 > > --- a/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt > > +++ b/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt > > @@ -25,6 +25,9 @@ Supported regulator node names: > > PM8998: smps1 - smps13, ldo1 - ldo28, lvs1 - lvs2 > > PMI8998: bob > > PM8005: smps1 - smps4 > > + PM8150: smps1 - smps10, ldo1 - ldo18 > > + PM8150L: smps1 - smps8, ldo1 - ldo11, bob, flash, rgb > > + PM8009: smps1 - smps2, ld01 - ldo7 > > Please maintain the sort order. Ah yes, Mark has applied the patch, I will send a sort order patch. Even in previous entries, PM8005 should be the first one.. > > Apart from that > > Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> Thanks for the review. -- ~Vinod ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-08-09 4:45 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-08-08 9:33 [PATCH 1/2] regulator: dt-bindings: Add PM8150x compatibles Vinod Koul 2019-08-08 9:33 ` [PATCH 2/2] regulator: qcom-rpmh: Add support for SM8150 Vinod Koul 2019-08-08 20:33 ` Applied "regulator: qcom-rpmh: Add support for SM8150" to the regulator tree Mark Brown 2019-08-09 3:32 ` [PATCH 2/2] regulator: qcom-rpmh: Add support for SM8150 Bjorn Andersson 2019-08-09 4:44 ` Vinod Koul 2019-08-08 20:33 ` Applied "regulator: dt-bindings: Add PM8150x compatibles" to the regulator tree Mark Brown 2019-08-09 3:29 ` [PATCH 1/2] regulator: dt-bindings: Add PM8150x compatibles Bjorn Andersson 2019-08-09 4:43 ` Vinod Koul
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).