regulator: dt-bindings: Add PM8150x compatibles
Subsystems (3)
PATCH 1/2 regulator: dt-bindings: Add PM8150x compatibles
Add PM8150, PM8150L and PM8009 compatibles for these PMICs found in some Qualcomm platforms.
--- .../devicetree/bindings/regulator/qcom,rpmh-regulator.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt +7 -1
@@ -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
Signature · 1 line
2.20.1
PATCH 2/2 regulator: qcom-rpmh: Add support for SM8150
Add support from RPMH regulators found in SM8150 platform
--- drivers/regulator/qcom-rpmh-regulator.c | 147 ++++++++++++++++++++++++ 1 file changed, 147 insertions(+)
drivers/regulator/qcom-rpmh-regulator.c +147 -0
@@ -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);
Signature · 1 line
2.20.1
Mark Brown
maintainerApplied "regulator: qcom-rpmh: Add support for SM8150" to the regulator tree
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
Quoted 1 line
From
06369bcc15a1620930a17fb35e26477504cd2255Mon Sep 17 00:00:00 2001
From: Vinod Koul <[email protected]>
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
--- drivers/regulator/qcom-rpmh-regulator.c | 147 ++++++++++++++++++++++++ 1 file changed, 147 insertions(+)
drivers/regulator/qcom-rpmh-regulator.c +147 -0
@@ -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);
Signature · 1 line
2.20.1
Re: [PATCH 2/2] regulator: qcom-rpmh: Add support for SM8150
In reply to Vinod KoulQuoted 1 line · Vinod Koul
drivers/regulator/qcom-rpmh-regulator.c +0
-0
[..]
drivers/regulator/qcom-rpmh-regulator.c static const struct rpmh_vreg_hw_data pmic4_lvs = { · line 701
Quoted 5 lines
drivers/regulator/qcom-rpmh-regulator.c +5
-0+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]
Quoted 4 lines
drivers/regulator/qcom-rpmh-regulator.c +4
-0+ .pmic_mode_map = pmic_mode_map_pmic4_bob, + .of_map_mode = rpmh_regulator_pmic4_bob_of_map_mode, +}; +
[..]
Quoted 6 lines
drivers/regulator/qcom-rpmh-regulator.c +2
-0@@ -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",
drivers/regulator/qcom-rpmh-regulator.c static const struct of_device_id rpmh_regulator_match_table[] = { · line 904
Quoted 10 lines
drivers/regulator/qcom-rpmh-regulator.c +10
-0+ .data = pm8150_vreg_data, + }, + { + .compatible = "qcom,pm8150l-rpmh-regulators", + .data = pm8150l_vreg_data, + }, + { + .compatible = "qcom,pm8009-rpmh-regulators", + .data = pm8009_vreg_data, + },
Sort order...
drivers/regulator/qcom-rpmh-regulator.c static const struct of_device_id rpmh_regulator_match_table[] = { · line 907
Quoted 3 lines
drivers/regulator/qcom-rpmh-regulator.c +0
-0{} };MODULE_DEVICE_TABLE (of, rpmh_regulator_match_table);
Apart from these nits this looks good.
Regards,
Bjorn
Re: [PATCH 2/2] regulator: qcom-rpmh: Add support for SM8150
Quoted 10 lines · Bjorn Andersson
Quoted 1 line · Vinod Koul
drivers/regulator/qcom-rpmh-regulator.c +0
-0[..]
drivers/regulator/qcom-rpmh-regulator.c static const struct rpmh_vreg_hw_data pmic4_lvs = { · line 701
Quoted 5 lines
drivers/regulator/qcom-rpmh-regulator.c +5
-0+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
Quoted 16 lines
Quoted 5 lines
drivers/regulator/qcom-rpmh-regulator.c +4
-0+ .pmic_mode_map = pmic_mode_map_pmic4_bob, + .of_map_mode = rpmh_regulator_pmic4_bob_of_map_mode, +}; +[..]
Quoted 10 lines
drivers/regulator/qcom-rpmh-regulator.c +6
-0@@ -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",
Quoted 8 lines
drivers/regulator/qcom-rpmh-regulator.c static const struct of_device_id rpmh_regulator_match_table[] = { · line 904
Quoted 6 lines
drivers/regulator/qcom-rpmh-regulator.c +6
-0+ .data = pm8150l_vreg_data, + }, + { + .compatible = "qcom,pm8009-rpmh-regulators", + .data = pm8009_vreg_data, + },Sort order...
Yes will sort all entries.
Quoted 5 lines
drivers/regulator/qcom-rpmh-regulator.c static const struct of_device_id rpmh_regulator_match_table[] = { · line 907
Quoted 3 lines
drivers/regulator/qcom-rpmh-regulator.c +0
-0{} };MODULE_DEVICE_TABLE (of, rpmh_regulator_match_table);Apart from these nits this looks good.
Thanks :)
Signature · 1 line
~Vinod
Mark Brown
maintainerApplied "regulator: dt-bindings: Add PM8150x compatibles" to the regulator tree
In reply to Vinod KoulThe 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
Quoted 1 line
From
d566aae1c80d9be2276057b3236c68bdcc5b3254Mon Sep 17 00:00:00 2001
From: Vinod Koul <[email protected]>
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.
--- .../devicetree/bindings/regulator/qcom,rpmh-regulator.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt +7 -1
@@ -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
Signature · 1 line
2.20.1
Quoted 13 lines · Vinod Koul
Add PM8150, PM8150L and PM8009 compatibles for these PMICs found in some Qualcomm platforms.
Signed-off-by Vinod Koul <[email protected]>--- .../devicetree/bindings/regulator/qcom,rpmh-regulator.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt +0
-0
Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt Supported regulator node names: · line 30
Quoted 6 lines
Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt +3
-0@@ -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
Regards,
Bjorn
Quoted 18 lines
Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt +4
-1======================== 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: requiredSignature · 1 line
2.20.1
Quoted 10 lines · Bjorn Andersson
Quoted 8 lines · Vinod Koul
Add PM8150, PM8150L and PM8009 compatibles for these PMICs found in some Qualcomm platforms.
Signed-off-by Vinod Koul <[email protected]>--- .../devicetree/bindings/regulator/qcom,rpmh-regulator.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
Quoted 13 lines
Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt Supported regulator node names: · line 30
Quoted 11 lines
Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt +3
-0@@ -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 - ldo7Please 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..
Quoted 4 lines
Apart from that
Reviewed-by Bjorn Andersson <[email protected]>
Thanks for the review.
Signature · 1 line
~Vinod