regulator: dt-bindings: Sort the compatibles and nodes
Subsystems (3)
PATCH 1/4 regulator: dt-bindings: Sort the compatibles and nodes
It helps to keep sorted order for compatibles and nodes, so sort them
--- .../regulator/qcom,rpmh-regulator.txt | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt +10 -9
@@ -22,12 +22,12 @@ RPMh resource. The names used for regulator nodes must match those supported by a given PMIC. Supported regulator node names: - PM8998: smps1 - smps13, ldo1 - ldo28, lvs1 - lvs2 - PMI8998: bob PM8005: smps1 - smps4 + PM8009: smps1 - smps2, ldo1 - ldo7 PM8150: smps1 - smps10, ldo1 - ldo18 PM8150L: smps1 - smps8, ldo1 - ldo11, bob, flash, rgb - PM8009: smps1 - smps2, ld01 - ldo7 + PM8998: smps1 - smps13, ldo1 - ldo28, lvs1 - lvs2 + PMI8998: bob ======================== First Level Nodes - PMIC
@@ -36,12 +36,13 @@ First Level Nodes - PMIC - compatible Usage: required Value type: <string> - Definition: Must be one of: "qcom,pm8998-rpmh-regulators", - "qcom,pmi8998-rpmh-regulators" or - "qcom,pm8005-rpmh-regulators" or - "qcom,pm8150-rpmh-regulators" or - "qcom,pm8150l-rpmh-regulators" or - "qcom,pm8009-rpmh-regulators". + Definition: Must be one of below: + "qcom,pm8005-rpmh-regulators" + "qcom,pm8009-rpmh-regulators" + "qcom,pm8150-rpmh-regulators" + "qcom,pm8150l-rpmh-regulators" + "qcom,pm8998-rpmh-regulators" + "qcom,pmi8998-rpmh-regulators" - qcom,pmic-id Usage: required
Signature · 1 line
2.20.1
PATCH 2/4 regulator: qcom-rpmh: Sort the compatibles
It helps to keep sorted order for compatibles, so sort them
--- drivers/regulator/qcom-rpmh-regulator.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/regulator/qcom-rpmh-regulator.c +10 -10
@@ -878,18 +878,14 @@ static int rpmh_regulator_probe(struct platform_device *pdev) }static const struct of_device_id rpmh_regulator_match_table[] = { - { - .compatible ="qcom,pm8998-rpmh-regulators" , - .data = pm8998_vreg_data, - }, - { - .compatible ="qcom,pmi8998-rpmh-regulators" , - .data = pmi8998_vreg_data, - }, { .compatible ="qcom,pm8005-rpmh-regulators" , .data = pm8005_vreg_data, }, + { + .compatible ="qcom,pm8009-rpmh-regulators" , + .data = pm8009_vreg_data, + }, { .compatible ="qcom,pm8150-rpmh-regulators" , .data = pm8150_vreg_data,
@@ -899,8 +895,12 @@ static const struct of_device_id rpmh_regulator_match_table[] = { .data = pm8150l_vreg_data, }, { - .compatible = "qcom,pm8009-rpmh-regulators", - .data = pm8009_vreg_data, + .compatible = "qcom,pm8998-rpmh-regulators", + .data = pm8998_vreg_data, + }, + { + .compatible = "qcom,pmi8998-rpmh-regulators", + .data = pmi8998_vreg_data, }, {} };
Signature · 1 line
2.20.1
Mark Brown
maintainerApplied "regulator: qcom-rpmh: Sort the compatibles" to the regulator tree
The patch
regulator: qcom-rpmh: Sort the 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
7172fb7f3abea4787ca01dda7297241c4b0f0af5Mon Sep 17 00:00:00 2001
From: Vinod Koul <[email protected]>
Date: Fri, 9 Aug 2019 13:06:14 +0530
Subject: [PATCH] regulator: qcom-rpmh: Sort the compatibles
It helps to keep sorted order for compatibles, so sort them
--- drivers/regulator/qcom-rpmh-regulator.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/regulator/qcom-rpmh-regulator.c +10 -10
@@ -878,18 +878,14 @@ static int rpmh_regulator_probe(struct platform_device *pdev) }static const struct of_device_id rpmh_regulator_match_table[] = { - { - .compatible ="qcom,pm8998-rpmh-regulators" , - .data = pm8998_vreg_data, - }, - { - .compatible ="qcom,pmi8998-rpmh-regulators" , - .data = pmi8998_vreg_data, - }, { .compatible ="qcom,pm8005-rpmh-regulators" , .data = pm8005_vreg_data, }, + { + .compatible ="qcom,pm8009-rpmh-regulators" , + .data = pm8009_vreg_data, + }, { .compatible ="qcom,pm8150-rpmh-regulators" , .data = pm8150_vreg_data,
@@ -899,8 +895,12 @@ static const struct of_device_id rpmh_regulator_match_table[] = { .data = pm8150l_vreg_data, }, { - .compatible = "qcom,pm8009-rpmh-regulators", - .data = pm8009_vreg_data, + .compatible = "qcom,pm8998-rpmh-regulators", + .data = pm8998_vreg_data, + }, + { + .compatible = "qcom,pmi8998-rpmh-regulators", + .data = pmi8998_vreg_data, }, {} };
Signature · 1 line
2.20.1
Re: [PATCH 2/4] regulator: qcom-rpmh: Sort the compatibles
In reply to Vinod KoulQuoted 4 lines · Vinod Koul
It helps to keep sorted order for compatibles, so sort them
Suggested-by Bjorn Andersson <[email protected]>Signed-off-by Vinod Koul <[email protected]>
Quoted 49 lines
--- drivers/regulator/qcom-rpmh-regulator.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)drivers/regulator/qcom-rpmh-regulator.c +10
-10@@ -878,18 +878,14 @@ static int rpmh_regulator_probe(struct platform_device *pdev) }static const struct of_device_id rpmh_regulator_match_table[] = { - { - .compatible ="qcom,pm8998-rpmh-regulators" , - .data = pm8998_vreg_data, - }, - { - .compatible ="qcom,pmi8998-rpmh-regulators" , - .data = pmi8998_vreg_data, - }, { .compatible ="qcom,pm8005-rpmh-regulators" , .data = pm8005_vreg_data, }, + { + .compatible ="qcom,pm8009-rpmh-regulators" , + .data = pm8009_vreg_data, + }, { .compatible ="qcom,pm8150-rpmh-regulators" , .data = pm8150_vreg_data,@@ -899,8 +895,12 @@ static const struct of_device_id rpmh_regulator_match_table[] = { .data = pm8150l_vreg_data, }, { - .compatible = "qcom,pm8009-rpmh-regulators", - .data = pm8009_vreg_data, + .compatible = "qcom,pm8998-rpmh-regulators", + .data = pm8998_vreg_data, + }, + { + .compatible = "qcom,pmi8998-rpmh-regulators", + .data = pmi8998_vreg_data, }, {} };Signature · 1 line
2.20.1
PATCH 3/4 regulator: qcom-rpmh: Fix pmic5_bob voltage count
In reply to Vinod Koulpmic5_bob voltages count is 136 [0,135] so update it
--- drivers/regulator/qcom-rpmh-regulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/qcom-rpmh-regulator.c +1 -1
@@ -698,7 +698,7 @@ 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, + .n_voltages = 136, .pmic_mode_map = pmic_mode_map_pmic4_bob, .of_map_mode = rpmh_regulator_pmic4_bob_of_map_mode, };
Signature · 1 line
2.20.1
Mark Brown
maintainerApplied "regulator: qcom-rpmh: Fix pmic5_bob voltage count" to the regulator tree
The patch
regulator: qcom-rpmh: Fix pmic5_bob voltage count
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
553c452d6093d66e7617ed6c68cc93547d07075fMon Sep 17 00:00:00 2001
From: Vinod Koul <[email protected]>
Date: Fri, 9 Aug 2019 13:06:15 +0530
Subject: [PATCH] regulator: qcom-rpmh: Fix pmic5_bob voltage count
pmic5_bob voltages count is 136 [0,135] so update it
--- drivers/regulator/qcom-rpmh-regulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/qcom-rpmh-regulator.c +1 -1
@@ -698,7 +698,7 @@ 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, + .n_voltages = 136, .pmic_mode_map = pmic_mode_map_pmic4_bob, .of_map_mode = rpmh_regulator_pmic4_bob_of_map_mode, };
Signature · 1 line
2.20.1
Re: [PATCH 3/4] regulator: qcom-rpmh: Fix pmic5_bob voltage count
In reply to Vinod KoulQuoted 3 lines · Vinod Koul
pmic5_bobvoltages count is 136 [0,135] so update itSigned-off-by Vinod Koul <[email protected]>
Quoted 20 lines
--- drivers/regulator/qcom-rpmh-regulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/regulator/qcom-rpmh-regulator.c +1
-1@@ -698,7 +698,7 @@ 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, + .n_voltages = 136, .pmic_mode_map = pmic_mode_map_pmic4_bob, .of_map_mode = rpmh_regulator_pmic4_bob_of_map_mode, };Signature · 1 line
2.20.1
PATCH 4/4 regulator: qcom-rpmh: Update PMIC modes for PMIC5
In reply to Vinod KoulAdd the PMIC5 modes and use them pmic5 ldo and smps
--- drivers/regulator/qcom-rpmh-regulator.c | 52 +++++++++++++++++++++---- 1 file changed, 45 insertions(+), 7 deletions(-)
drivers/regulator/qcom-rpmh-regulator.c +45 -7
@@ -50,6 +50,20 @@ enum rpmh_regulator_type {#define PMIC4_BOB_MODE_AUTO 2#define PMIC4_BOB_MODE_PWM 3 +#define PMIC5_LDO_MODE_RETENTION 3 +#define PMIC5_LDO_MODE_LPM 4 +#define PMIC5_LDO_MODE_HPM 7 + +#define PMIC5_SMPS_MODE_RETENTION 3 +#define PMIC5_SMPS_MODE_PFM 4 +#define PMIC5_SMPS_MODE_AUTO 6 +#define PMIC5_SMPS_MODE_PWM 7 + +#define PMIC5_BOB_MODE_PASS 2 +#define PMIC5_BOB_MODE_PFM 4 +#define PMIC5_BOB_MODE_AUTO 6 +#define PMIC5_BOB_MODE_PWM 7 +/** * struct rpmh_vreg_hw_data - RPMh regulator hardware configurations * @regulator_type: RPMh accelerator type used to manage this
@@ -488,6 +502,14 @@ static const int pmic_mode_map_pmic4_ldo[REGULATOR_MODE_STANDBY + 1] = { [REGULATOR_MODE_FAST] = -EINVAL, }; +static const int pmic_mode_map_pmic5_ldo[REGULATOR_MODE_STANDBY +1 ] = { + [REGULATOR_MODE_INVALID ] = -EINVAL , + [REGULATOR_MODE_STANDBY ] =PMIC5_LDO_MODE_RETENTION , + [REGULATOR_MODE_IDLE ] =PMIC5_LDO_MODE_LPM , + [REGULATOR_MODE_NORMAL ] =PMIC5_LDO_MODE_HPM , + [REGULATOR_MODE_FAST ] = -EINVAL , +}; +static unsigned int rpmh_regulator_pmic4_ldo_of_map_mode (unsigned int rpmh_mode) {unsigned int mode;
@@ -518,6 +540,14 @@ static const int pmic_mode_map_pmic4_smps[REGULATOR_MODE_STANDBY + 1] = { [REGULATOR_MODE_FAST] = PMIC4_SMPS_MODE_PWM, }; +static const int pmic_mode_map_pmic5_smps[REGULATOR_MODE_STANDBY +1 ] = { + [REGULATOR_MODE_INVALID ] = -EINVAL , + [REGULATOR_MODE_STANDBY ] =PMIC5_SMPS_MODE_RETENTION , + [REGULATOR_MODE_IDLE ] =PMIC5_SMPS_MODE_PFM , + [REGULATOR_MODE_NORMAL ] =PMIC5_SMPS_MODE_AUTO , + [REGULATOR_MODE_FAST ] =PMIC5_SMPS_MODE_PWM , +}; +static unsigned int rpmh_regulator_pmic4_smps_of_map_mode (unsigned int rpmh_mode) {
@@ -552,6 +582,14 @@ static const int pmic_mode_map_pmic4_bob[REGULATOR_MODE_STANDBY + 1] = { [REGULATOR_MODE_FAST] = PMIC4_BOB_MODE_PWM, }; +static const int pmic_mode_map_pmic5_bob[REGULATOR_MODE_STANDBY +1 ] = { + [REGULATOR_MODE_INVALID ] = -EINVAL , + [REGULATOR_MODE_STANDBY ] = -EINVAL , + [REGULATOR_MODE_IDLE ] =PMIC5_BOB_MODE_PFM , + [REGULATOR_MODE_NORMAL ] =PMIC5_BOB_MODE_AUTO , + [REGULATOR_MODE_FAST ] =PMIC5_BOB_MODE_PWM , +}; +static unsigned int rpmh_regulator_pmic4_bob_of_map_mode (unsigned int rpmh_mode) {unsigned int mode;
@@ -643,7 +681,7 @@ static const struct rpmh_vreg_hw_data pmic5_pldo = { .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, + .pmic_mode_map = pmic_mode_map_pmic5_ldo, .of_map_mode = rpmh_regulator_pmic4_ldo_of_map_mode, };
@@ -653,7 +691,7 @@ static const struct rpmh_vreg_hw_data pmic5_pldo_lv = { .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, + .pmic_mode_map = pmic_mode_map_pmic5_ldo, .of_map_mode = rpmh_regulator_pmic4_ldo_of_map_mode, };
@@ -663,7 +701,7 @@ static const struct rpmh_vreg_hw_data pmic5_nldo = { .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, + .pmic_mode_map = pmic_mode_map_pmic5_ldo, .of_map_mode = rpmh_regulator_pmic4_ldo_of_map_mode, };
@@ -672,7 +710,7 @@ static const struct rpmh_vreg_hw_data pmic5_hfsmps510 = { .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, + .pmic_mode_map = pmic_mode_map_pmic5_smps, .of_map_mode = rpmh_regulator_pmic4_smps_of_map_mode, };
@@ -681,7 +719,7 @@ static const struct rpmh_vreg_hw_data pmic5_ftsmps510 = { .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, + .pmic_mode_map = pmic_mode_map_pmic5_smps, .of_map_mode = rpmh_regulator_pmic4_smps_of_map_mode, };
@@ -690,7 +728,7 @@ static const struct rpmh_vreg_hw_data pmic5_hfsmps515 = { .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, + .pmic_mode_map = pmic_mode_map_pmic5_smps, .of_map_mode = rpmh_regulator_pmic4_smps_of_map_mode, };
@@ -699,7 +737,7 @@ static const struct rpmh_vreg_hw_data pmic5_bob = { .ops = &rpmh_regulator_vrm_bypass_ops, .voltage_range = REGULATOR_LINEAR_RANGE(300000, 0, 135, 32000), .n_voltages = 136, - .pmic_mode_map = pmic_mode_map_pmic4_bob, + .pmic_mode_map = pmic_mode_map_pmic5_bob, .of_map_mode = rpmh_regulator_pmic4_bob_of_map_mode, };
Signature · 1 line
2.20.1
Mark Brown
maintainerApplied "regulator: qcom-rpmh: Update PMIC modes for PMIC5" to the regulator tree
The patch
regulator: qcom-rpmh: Update PMIC modes for PMIC5
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
610f29e5cc0e8d5864dd049b0b3576d9437ae7b4Mon Sep 17 00:00:00 2001
From: Vinod Koul <[email protected]>
Date: Fri, 9 Aug 2019 13:06:16 +0530
Subject: [PATCH] regulator: qcom-rpmh: Update PMIC modes for PMIC5
Add the PMIC5 modes and use them pmic5 ldo and smps
--- drivers/regulator/qcom-rpmh-regulator.c | 52 +++++++++++++++++++++---- 1 file changed, 45 insertions(+), 7 deletions(-)
drivers/regulator/qcom-rpmh-regulator.c +45 -7
@@ -50,6 +50,20 @@ enum rpmh_regulator_type {#define PMIC4_BOB_MODE_AUTO 2#define PMIC4_BOB_MODE_PWM 3 +#define PMIC5_LDO_MODE_RETENTION 3 +#define PMIC5_LDO_MODE_LPM 4 +#define PMIC5_LDO_MODE_HPM 7 + +#define PMIC5_SMPS_MODE_RETENTION 3 +#define PMIC5_SMPS_MODE_PFM 4 +#define PMIC5_SMPS_MODE_AUTO 6 +#define PMIC5_SMPS_MODE_PWM 7 + +#define PMIC5_BOB_MODE_PASS 2 +#define PMIC5_BOB_MODE_PFM 4 +#define PMIC5_BOB_MODE_AUTO 6 +#define PMIC5_BOB_MODE_PWM 7 +/** * struct rpmh_vreg_hw_data - RPMh regulator hardware configurations * @regulator_type: RPMh accelerator type used to manage this
@@ -488,6 +502,14 @@ static const int pmic_mode_map_pmic4_ldo[REGULATOR_MODE_STANDBY + 1] = { [REGULATOR_MODE_FAST] = -EINVAL, }; +static const int pmic_mode_map_pmic5_ldo[REGULATOR_MODE_STANDBY +1 ] = { + [REGULATOR_MODE_INVALID ] = -EINVAL , + [REGULATOR_MODE_STANDBY ] =PMIC5_LDO_MODE_RETENTION , + [REGULATOR_MODE_IDLE ] =PMIC5_LDO_MODE_LPM , + [REGULATOR_MODE_NORMAL ] =PMIC5_LDO_MODE_HPM , + [REGULATOR_MODE_FAST ] = -EINVAL , +}; +static unsigned int rpmh_regulator_pmic4_ldo_of_map_mode (unsigned int rpmh_mode) {unsigned int mode;
@@ -518,6 +540,14 @@ static const int pmic_mode_map_pmic4_smps[REGULATOR_MODE_STANDBY + 1] = { [REGULATOR_MODE_FAST] = PMIC4_SMPS_MODE_PWM, }; +static const int pmic_mode_map_pmic5_smps[REGULATOR_MODE_STANDBY +1 ] = { + [REGULATOR_MODE_INVALID ] = -EINVAL , + [REGULATOR_MODE_STANDBY ] =PMIC5_SMPS_MODE_RETENTION , + [REGULATOR_MODE_IDLE ] =PMIC5_SMPS_MODE_PFM , + [REGULATOR_MODE_NORMAL ] =PMIC5_SMPS_MODE_AUTO , + [REGULATOR_MODE_FAST ] =PMIC5_SMPS_MODE_PWM , +}; +static unsigned int rpmh_regulator_pmic4_smps_of_map_mode (unsigned int rpmh_mode) {
@@ -552,6 +582,14 @@ static const int pmic_mode_map_pmic4_bob[REGULATOR_MODE_STANDBY + 1] = { [REGULATOR_MODE_FAST] = PMIC4_BOB_MODE_PWM, }; +static const int pmic_mode_map_pmic5_bob[REGULATOR_MODE_STANDBY +1 ] = { + [REGULATOR_MODE_INVALID ] = -EINVAL , + [REGULATOR_MODE_STANDBY ] = -EINVAL , + [REGULATOR_MODE_IDLE ] =PMIC5_BOB_MODE_PFM , + [REGULATOR_MODE_NORMAL ] =PMIC5_BOB_MODE_AUTO , + [REGULATOR_MODE_FAST ] =PMIC5_BOB_MODE_PWM , +}; +static unsigned int rpmh_regulator_pmic4_bob_of_map_mode (unsigned int rpmh_mode) {unsigned int mode;
@@ -643,7 +681,7 @@ static const struct rpmh_vreg_hw_data pmic5_pldo = { .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, + .pmic_mode_map = pmic_mode_map_pmic5_ldo, .of_map_mode = rpmh_regulator_pmic4_ldo_of_map_mode, };
@@ -653,7 +691,7 @@ static const struct rpmh_vreg_hw_data pmic5_pldo_lv = { .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, + .pmic_mode_map = pmic_mode_map_pmic5_ldo, .of_map_mode = rpmh_regulator_pmic4_ldo_of_map_mode, };
@@ -663,7 +701,7 @@ static const struct rpmh_vreg_hw_data pmic5_nldo = { .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, + .pmic_mode_map = pmic_mode_map_pmic5_ldo, .of_map_mode = rpmh_regulator_pmic4_ldo_of_map_mode, };
@@ -672,7 +710,7 @@ static const struct rpmh_vreg_hw_data pmic5_hfsmps510 = { .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, + .pmic_mode_map = pmic_mode_map_pmic5_smps, .of_map_mode = rpmh_regulator_pmic4_smps_of_map_mode, };
@@ -681,7 +719,7 @@ static const struct rpmh_vreg_hw_data pmic5_ftsmps510 = { .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, + .pmic_mode_map = pmic_mode_map_pmic5_smps, .of_map_mode = rpmh_regulator_pmic4_smps_of_map_mode, };
@@ -690,7 +728,7 @@ static const struct rpmh_vreg_hw_data pmic5_hfsmps515 = { .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, + .pmic_mode_map = pmic_mode_map_pmic5_smps, .of_map_mode = rpmh_regulator_pmic4_smps_of_map_mode, };
@@ -699,7 +737,7 @@ static const struct rpmh_vreg_hw_data pmic5_bob = { .ops = &rpmh_regulator_vrm_bypass_ops, .voltage_range = REGULATOR_LINEAR_RANGE(300000, 0, 135, 32000), .n_voltages = 136, - .pmic_mode_map = pmic_mode_map_pmic4_bob, + .pmic_mode_map = pmic_mode_map_pmic5_bob, .of_map_mode = rpmh_regulator_pmic4_bob_of_map_mode, };
Signature · 1 line
2.20.1
Re: [PATCH 4/4] regulator: qcom-rpmh: Update PMIC modes for PMIC5
In reply to Vinod KoulQuoted 3 lines · Vinod Koul
Add the PMIC5 modes and use them pmic5 ldo and smps
Signed-off-by Vinod Koul <[email protected]>
Quoted 140 lines
--- drivers/regulator/qcom-rpmh-regulator.c | 52 +++++++++++++++++++++---- 1 file changed, 45 insertions(+), 7 deletions(-)drivers/regulator/qcom-rpmh-regulator.c +45
-7@@ -50,6 +50,20 @@ enum rpmh_regulator_type {#define PMIC4_BOB_MODE_AUTO 2#define PMIC4_BOB_MODE_PWM 3 +#define PMIC5_LDO_MODE_RETENTION 3 +#define PMIC5_LDO_MODE_LPM 4 +#define PMIC5_LDO_MODE_HPM 7 + +#define PMIC5_SMPS_MODE_RETENTION 3 +#define PMIC5_SMPS_MODE_PFM 4 +#define PMIC5_SMPS_MODE_AUTO 6 +#define PMIC5_SMPS_MODE_PWM 7 + +#define PMIC5_BOB_MODE_PASS 2 +#define PMIC5_BOB_MODE_PFM 4 +#define PMIC5_BOB_MODE_AUTO 6 +#define PMIC5_BOB_MODE_PWM 7 +/** * struct rpmh_vreg_hw_data - RPMh regulator hardware configurations * @regulator_type: RPMh accelerator type used to manage this @@ -488,6 +502,14 @@ static const int pmic_mode_map_pmic4_ldo[REGULATOR_MODE_STANDBY + 1] = { [REGULATOR_MODE_FAST] = -EINVAL, }; +static const int pmic_mode_map_pmic5_ldo[REGULATOR_MODE_STANDBY +1 ] = { + [REGULATOR_MODE_INVALID ] = -EINVAL , + [REGULATOR_MODE_STANDBY ] =PMIC5_LDO_MODE_RETENTION , + [REGULATOR_MODE_IDLE ] =PMIC5_LDO_MODE_LPM , + [REGULATOR_MODE_NORMAL ] =PMIC5_LDO_MODE_HPM , + [REGULATOR_MODE_FAST ] = -EINVAL , +}; +static unsigned int rpmh_regulator_pmic4_ldo_of_map_mode (unsigned int rpmh_mode) {unsigned int mode;@@ -518,6 +540,14 @@ static const int pmic_mode_map_pmic4_smps[REGULATOR_MODE_STANDBY + 1] = { [REGULATOR_MODE_FAST] = PMIC4_SMPS_MODE_PWM, }; +static const int pmic_mode_map_pmic5_smps[REGULATOR_MODE_STANDBY +1 ] = { + [REGULATOR_MODE_INVALID ] = -EINVAL , + [REGULATOR_MODE_STANDBY ] =PMIC5_SMPS_MODE_RETENTION , + [REGULATOR_MODE_IDLE ] =PMIC5_SMPS_MODE_PFM , + [REGULATOR_MODE_NORMAL ] =PMIC5_SMPS_MODE_AUTO , + [REGULATOR_MODE_FAST ] =PMIC5_SMPS_MODE_PWM , +}; +static unsigned int rpmh_regulator_pmic4_smps_of_map_mode (unsigned int rpmh_mode) {@@ -552,6 +582,14 @@ static const int pmic_mode_map_pmic4_bob[REGULATOR_MODE_STANDBY + 1] = { [REGULATOR_MODE_FAST] = PMIC4_BOB_MODE_PWM, }; +static const int pmic_mode_map_pmic5_bob[REGULATOR_MODE_STANDBY +1 ] = { + [REGULATOR_MODE_INVALID ] = -EINVAL , + [REGULATOR_MODE_STANDBY ] = -EINVAL , + [REGULATOR_MODE_IDLE ] =PMIC5_BOB_MODE_PFM , + [REGULATOR_MODE_NORMAL ] =PMIC5_BOB_MODE_AUTO , + [REGULATOR_MODE_FAST ] =PMIC5_BOB_MODE_PWM , +}; +static unsigned int rpmh_regulator_pmic4_bob_of_map_mode (unsigned int rpmh_mode) {unsigned int mode;@@ -643,7 +681,7 @@ static const struct rpmh_vreg_hw_data pmic5_pldo = { .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, + .pmic_mode_map = pmic_mode_map_pmic5_ldo, .of_map_mode = rpmh_regulator_pmic4_ldo_of_map_mode, };@@ -653,7 +691,7 @@ static const struct rpmh_vreg_hw_data pmic5_pldo_lv = { .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, + .pmic_mode_map = pmic_mode_map_pmic5_ldo, .of_map_mode = rpmh_regulator_pmic4_ldo_of_map_mode, };@@ -663,7 +701,7 @@ static const struct rpmh_vreg_hw_data pmic5_nldo = { .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, + .pmic_mode_map = pmic_mode_map_pmic5_ldo, .of_map_mode = rpmh_regulator_pmic4_ldo_of_map_mode, };@@ -672,7 +710,7 @@ static const struct rpmh_vreg_hw_data pmic5_hfsmps510 = { .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, + .pmic_mode_map = pmic_mode_map_pmic5_smps, .of_map_mode = rpmh_regulator_pmic4_smps_of_map_mode, };@@ -681,7 +719,7 @@ static const struct rpmh_vreg_hw_data pmic5_ftsmps510 = { .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, + .pmic_mode_map = pmic_mode_map_pmic5_smps, .of_map_mode = rpmh_regulator_pmic4_smps_of_map_mode, };@@ -690,7 +728,7 @@ static const struct rpmh_vreg_hw_data pmic5_hfsmps515 = { .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, + .pmic_mode_map = pmic_mode_map_pmic5_smps, .of_map_mode = rpmh_regulator_pmic4_smps_of_map_mode, };@@ -699,7 +737,7 @@ static const struct rpmh_vreg_hw_data pmic5_bob = { .ops = &rpmh_regulator_vrm_bypass_ops, .voltage_range = REGULATOR_LINEAR_RANGE(300000, 0, 135, 32000), .n_voltages = 136, - .pmic_mode_map = pmic_mode_map_pmic4_bob, + .pmic_mode_map = pmic_mode_map_pmic5_bob, .of_map_mode = rpmh_regulator_pmic4_bob_of_map_mode, };Signature · 1 line
2.20.1
Mark Brown
maintainerApplied "regulator: dt-bindings: Sort the compatibles and nodes" to the regulator tree
In reply to Vinod KoulThe patch
regulator: dt-bindings: Sort the compatibles and nodes
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
c6e20fa49818381dfa7288fad4c33b84408aab54Mon Sep 17 00:00:00 2001
From: Vinod Koul <[email protected]>
Date: Fri, 9 Aug 2019 13:06:13 +0530
Subject: [PATCH] regulator: dt-bindings: Sort the compatibles and nodes
It helps to keep sorted order for compatibles and nodes, so sort them
--- .../regulator/qcom,rpmh-regulator.txt | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt +10 -9
@@ -22,12 +22,12 @@ RPMh resource. The names used for regulator nodes must match those supported by a given PMIC. Supported regulator node names: - PM8998: smps1 - smps13, ldo1 - ldo28, lvs1 - lvs2 - PMI8998: bob PM8005: smps1 - smps4 + PM8009: smps1 - smps2, ldo1 - ldo7 PM8150: smps1 - smps10, ldo1 - ldo18 PM8150L: smps1 - smps8, ldo1 - ldo11, bob, flash, rgb - PM8009: smps1 - smps2, ld01 - ldo7 + PM8998: smps1 - smps13, ldo1 - ldo28, lvs1 - lvs2 + PMI8998: bob ======================== First Level Nodes - PMIC
@@ -36,12 +36,13 @@ First Level Nodes - PMIC - compatible Usage: required Value type: <string> - Definition: Must be one of: "qcom,pm8998-rpmh-regulators", - "qcom,pmi8998-rpmh-regulators" or - "qcom,pm8005-rpmh-regulators" or - "qcom,pm8150-rpmh-regulators" or - "qcom,pm8150l-rpmh-regulators" or - "qcom,pm8009-rpmh-regulators". + Definition: Must be one of below: + "qcom,pm8005-rpmh-regulators" + "qcom,pm8009-rpmh-regulators" + "qcom,pm8150-rpmh-regulators" + "qcom,pm8150l-rpmh-regulators" + "qcom,pm8998-rpmh-regulators" + "qcom,pmi8998-rpmh-regulators" - qcom,pmic-id Usage: required
Signature · 1 line
2.20.1
Quoted 35 lines · Vinod Koul
It helps to keep sorted order for compatibles and nodes, so sort them
Suggested-by Bjorn Andersson <[email protected]>Signed-off-by Vinod Koul <[email protected]>--- .../regulator/qcom,rpmh-regulator.txt | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt +3
-6@@ -22,12 +22,12 @@ RPMh resource. The names used for regulator nodes must match those supported by a given PMIC. Supported regulator node names: - PM8998: smps1 - smps13, ldo1 - ldo28, lvs1 - lvs2 - PMI8998: bob PM8005: smps1 - smps4 + PM8009: smps1 - smps2, ldo1 - ldo7 PM8150: smps1 - smps10, ldo1 - ldo18 PM8150L: smps1 - smps8, ldo1 - ldo11, bob, flash, rgb - PM8009: smps1 - smps2, ld01 - ldo7 + PM8998: smps1 - smps13, ldo1 - ldo28, lvs1 - lvs2 + PMI8998: bob ======================== First Level Nodes - PMIC@@ -36,12 +36,13 @@ First Level Nodes - PMIC - compatible Usage: required Value type: <string> - Definition: Must be one of: "qcom,pm8998-rpmh-regulators", - "qcom,pmi8998-rpmh-regulators" or - "qcom,pm8005-rpmh-regulators" or
Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt First Level Nodes - PMIC · line 45
Quoted 10 lines
Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt +7
-3- "qcom,pm8150-rpmh-regulators" or - "qcom,pm8150l-rpmh-regulators" or - "qcom,pm8009-rpmh-regulators". + Definition: Must be one of below: + "qcom,pm8005-rpmh-regulators" + "qcom,pm8009-rpmh-regulators" + "qcom,pm8150-rpmh-regulators" + "qcom,pm8150l-rpmh-regulators" + "qcom,pm8998-rpmh-regulators" + "qcom,pmi8998-rpmh-regulators"
Thanks for dropping the "or" as well.
Quoted 6 lines
Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt +0
-0- qcom,pmic-id Usage: requiredSignature · 1 line
2.20.1