Downstream kernel parses resource names based on pm8950-rpm-regulator.dtsi
in such file qcom,resource-name takes three values: smpa,ldoa and clk0.
First appearance of RWSC/RWSM point to msm-4.4 kernel
which is way newer than what this platform was shipped with (msm-3.10).
For the max_state downstream code limit value to TURBO inside dts
with only one turbo_high being placed in msm-thermal bindings.
One of effects of requesting TURBO_HIGH vote is rebooting of device
which happens during voting inside WCNSS/IRIS,
this behavior was observed on LeEco S2 smartphone.
Fix regulator setup and drop unused resources.
Signed-off-by: Adam Skladowski <a39.skl@xxxxxxxxx>
---
drivers/soc/qcom/rpmpd.c | 25 +++++++++----------------
1 file changed, 9 insertions(+), 16 deletions(-)
diff --git a/drivers/soc/qcom/rpmpd.c b/drivers/soc/qcom/rpmpd.c
index 3135dd1dafe0..69bc7c4d0ace 100644
--- a/drivers/soc/qcom/rpmpd.c
+++ b/drivers/soc/qcom/rpmpd.c
@@ -166,13 +166,6 @@ static struct rpmpd cx_rwcx0_vfl = {
.key = KEY_FLOOR_LEVEL,
};
-static struct rpmpd cx_rwsc2_vfl = {
- .pd = { .name = "cx_vfl", },
- .res_type = RPMPD_RWSC,
- .res_id = 2,
- .key = KEY_FLOOR_LEVEL,
-};
-
static struct rpmpd cx_s1a_vfc = {
.pd = { .name = "cx_vfc", },
.res_type = RPMPD_SMPA,
@@ -328,6 +321,12 @@ static struct rpmpd mx_s6a_lvl_ao = {
.res_id = 6,
.key = KEY_LEVEL,
};
+static struct rpmpd mx_s6a_vfl = {
+ .pd = { .name = "mx_vfl", },
+ .res_type = RPMPD_SMPA,
+ .res_id = 6,
+ .key = KEY_FLOOR_LEVEL,
+};
static struct rpmpd mx_s7a_lvl_ao;
static struct rpmpd mx_s7a_lvl = {
@@ -361,12 +360,6 @@ static struct rpmpd mx_rwmx0_vfl = {
.key = KEY_FLOOR_LEVEL,
};
-static struct rpmpd mx_rwsm6_vfl = {
- .pd = { .name = "mx_vfl", },
- .res_type = RPMPD_RWSM,
- .res_id = 6,
- .key = KEY_FLOOR_LEVEL,
-};
/* MD */
static struct rpmpd md_s1a_corner_ao;
@@ -591,16 +584,16 @@ static const struct rpmpd_desc msm8953_desc = {
static struct rpmpd *msm8976_rpmpds[] = {
[MSM8976_VDDCX] = &cx_s2a_lvl,
[MSM8976_VDDCX_AO] = &cx_s2a_lvl_ao,
- [MSM8976_VDDCX_VFL] = &cx_rwsc2_vfl,
+ [MSM8976_VDDCX_VFL] = &cx_s2a_vfl,
[MSM8976_VDDMX] = &mx_s6a_lvl,
[MSM8976_VDDMX_AO] = &mx_s6a_lvl_ao,
- [MSM8976_VDDMX_VFL] = &mx_rwsm6_vfl,
+ [MSM8976_VDDMX_VFL] = &mx_s6a_vfl,
};
static const struct rpmpd_desc msm8976_desc = {
.rpmpds = msm8976_rpmpds,
.num_pds = ARRAY_SIZE(msm8976_rpmpds),
- .max_state = RPM_SMD_LEVEL_TURBO_HIGH,
+ .max_state = RPM_SMD_LEVEL_TURBO,
};
static struct rpmpd *msm8994_rpmpds[] = {
--
2.41.0
