regulator: bd71828: Don't overwrite runtime voltages

Some of the regulators on the BD71828 have common voltage setting for
RUN/SUSPEND/IDLE/LPSR states. The enable control can be set for each
state though.

The driver allows setting the voltage values for these states via
device-tree. As a side effect, setting the voltages for
SUSPEND/IDLE/LPSR will also change the RUN level voltage which is not
desired and can break the system.

The comment in code reflects this behaviour, but it is likely to not
make people any happier. The right thing to do is to allow setting the
enable/disable state at SUSPEND/IDLE/LPSR via device-tree, but to
disallow setting state specific voltages for those regulators.

BUCK1 is a bit different. It only shares the SUSPEND and LPSR state
voltages. The former behaviour of allowing to silently overwrite the
SUSPEND state voltage by LPSR state voltage is also changed here so that
the SUSPEND voltage is prioritized over LPSR voltage.

Prevent setting PMIC state specific voltages for regulators which do not
support it.

Signed-off-by: Matti Vaittinen <mazziesaccount@gmail.com>
Fixes: 522498f8cb8c ("regulator: bd71828: Basic support for ROHM bd71828 PMIC regulators")
Link: https://msgid.link/r/e1883ae1e3ae5668f1030455d4750923561f3d68.1715848512.git.mazziesaccount@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/regulator/bd71828-regulator.c b/drivers/regulator/bd71828-regulator.c
index 08d4ee369287e0d3c0d74b9eda0516b4992c1487..dd871ffe979c37ffa2b6789744ba01ab39d1f615 100644 (file)
--- a/drivers/regulator/bd71828-regulator.c
+++ b/drivers/regulator/bd71828-regulator.c
@@ -206,14 +206,11 @@ static const struct bd71828_regulator_data bd71828_rdata[] = {
                        .suspend_reg = BD71828_REG_BUCK1_SUSP_VOLT,
                        .suspend_mask = BD71828_MASK_BUCK1267_VOLT,
                        .suspend_on_mask = BD71828_MASK_SUSP_EN,
-                       .lpsr_on_mask = BD71828_MASK_LPSR_EN,
                        /*
                         * LPSR voltage is same as SUSPEND voltage. Allow
-                        * setting it so that regulator can be set enabled at
-                        * LPSR state
+                        * only enabling/disabling regulator for LPSR state
                         */
-                       .lpsr_reg = BD71828_REG_BUCK1_SUSP_VOLT,
-                       .lpsr_mask = BD71828_MASK_BUCK1267_VOLT,
+                       .lpsr_on_mask = BD71828_MASK_LPSR_EN,
                },
                .reg_inits = buck1_inits,
                .reg_init_amnt = ARRAY_SIZE(buck1_inits),
@@ -288,13 +285,7 @@ static const struct bd71828_regulator_data bd71828_rdata[] = {
                                     ROHM_DVS_LEVEL_SUSPEND |
                                     ROHM_DVS_LEVEL_LPSR,
                        .run_reg = BD71828_REG_BUCK3_VOLT,
-                       .idle_reg = BD71828_REG_BUCK3_VOLT,
-                       .suspend_reg = BD71828_REG_BUCK3_VOLT,
-                       .lpsr_reg = BD71828_REG_BUCK3_VOLT,
                        .run_mask = BD71828_MASK_BUCK3_VOLT,
-                       .idle_mask = BD71828_MASK_BUCK3_VOLT,
-                       .suspend_mask = BD71828_MASK_BUCK3_VOLT,
-                       .lpsr_mask = BD71828_MASK_BUCK3_VOLT,
                        .idle_on_mask = BD71828_MASK_IDLE_EN,
                        .suspend_on_mask = BD71828_MASK_SUSP_EN,
                        .lpsr_on_mask = BD71828_MASK_LPSR_EN,
@@ -329,13 +320,7 @@ static const struct bd71828_regulator_data bd71828_rdata[] = {
                                     ROHM_DVS_LEVEL_SUSPEND |
                                     ROHM_DVS_LEVEL_LPSR,
                        .run_reg = BD71828_REG_BUCK4_VOLT,
-                       .idle_reg = BD71828_REG_BUCK4_VOLT,
-                       .suspend_reg = BD71828_REG_BUCK4_VOLT,
-                       .lpsr_reg = BD71828_REG_BUCK4_VOLT,
                        .run_mask = BD71828_MASK_BUCK4_VOLT,
-                       .idle_mask = BD71828_MASK_BUCK4_VOLT,
-                       .suspend_mask = BD71828_MASK_BUCK4_VOLT,
-                       .lpsr_mask = BD71828_MASK_BUCK4_VOLT,
                        .idle_on_mask = BD71828_MASK_IDLE_EN,
                        .suspend_on_mask = BD71828_MASK_SUSP_EN,
                        .lpsr_on_mask = BD71828_MASK_LPSR_EN,
@@ -370,13 +355,7 @@ static const struct bd71828_regulator_data bd71828_rdata[] = {
                                     ROHM_DVS_LEVEL_SUSPEND |
                                     ROHM_DVS_LEVEL_LPSR,
                        .run_reg = BD71828_REG_BUCK5_VOLT,
-                       .idle_reg = BD71828_REG_BUCK5_VOLT,
-                       .suspend_reg = BD71828_REG_BUCK5_VOLT,
-                       .lpsr_reg = BD71828_REG_BUCK5_VOLT,
                        .run_mask = BD71828_MASK_BUCK5_VOLT,
-                       .idle_mask = BD71828_MASK_BUCK5_VOLT,
-                       .suspend_mask = BD71828_MASK_BUCK5_VOLT,
-                       .lpsr_mask = BD71828_MASK_BUCK5_VOLT,
                        .idle_on_mask = BD71828_MASK_IDLE_EN,
                        .suspend_on_mask = BD71828_MASK_SUSP_EN,
                        .lpsr_on_mask = BD71828_MASK_LPSR_EN,
@@ -493,13 +472,7 @@ static const struct bd71828_regulator_data bd71828_rdata[] = {
                                     ROHM_DVS_LEVEL_SUSPEND |
                                     ROHM_DVS_LEVEL_LPSR,
                        .run_reg = BD71828_REG_LDO1_VOLT,
-                       .idle_reg = BD71828_REG_LDO1_VOLT,
-                       .suspend_reg = BD71828_REG_LDO1_VOLT,
-                       .lpsr_reg = BD71828_REG_LDO1_VOLT,
                        .run_mask = BD71828_MASK_LDO_VOLT,
-                       .idle_mask = BD71828_MASK_LDO_VOLT,
-                       .suspend_mask = BD71828_MASK_LDO_VOLT,
-                       .lpsr_mask = BD71828_MASK_LDO_VOLT,
                        .idle_on_mask = BD71828_MASK_IDLE_EN,
                        .suspend_on_mask = BD71828_MASK_SUSP_EN,
                        .lpsr_on_mask = BD71828_MASK_LPSR_EN,
@@ -533,13 +506,7 @@ static const struct bd71828_regulator_data bd71828_rdata[] = {
                                     ROHM_DVS_LEVEL_SUSPEND |
                                     ROHM_DVS_LEVEL_LPSR,
                        .run_reg = BD71828_REG_LDO2_VOLT,
-                       .idle_reg = BD71828_REG_LDO2_VOLT,
-                       .suspend_reg = BD71828_REG_LDO2_VOLT,
-                       .lpsr_reg = BD71828_REG_LDO2_VOLT,
                        .run_mask = BD71828_MASK_LDO_VOLT,
-                       .idle_mask = BD71828_MASK_LDO_VOLT,
-                       .suspend_mask = BD71828_MASK_LDO_VOLT,
-                       .lpsr_mask = BD71828_MASK_LDO_VOLT,
                        .idle_on_mask = BD71828_MASK_IDLE_EN,
                        .suspend_on_mask = BD71828_MASK_SUSP_EN,
                        .lpsr_on_mask = BD71828_MASK_LPSR_EN,
@@ -573,13 +540,7 @@ static const struct bd71828_regulator_data bd71828_rdata[] = {
                                     ROHM_DVS_LEVEL_SUSPEND |
                                     ROHM_DVS_LEVEL_LPSR,
                        .run_reg = BD71828_REG_LDO3_VOLT,
-                       .idle_reg = BD71828_REG_LDO3_VOLT,
-                       .suspend_reg = BD71828_REG_LDO3_VOLT,
-                       .lpsr_reg = BD71828_REG_LDO3_VOLT,
                        .run_mask = BD71828_MASK_LDO_VOLT,
-                       .idle_mask = BD71828_MASK_LDO_VOLT,
-                       .suspend_mask = BD71828_MASK_LDO_VOLT,
-                       .lpsr_mask = BD71828_MASK_LDO_VOLT,
                        .idle_on_mask = BD71828_MASK_IDLE_EN,
                        .suspend_on_mask = BD71828_MASK_SUSP_EN,
                        .lpsr_on_mask = BD71828_MASK_LPSR_EN,
@@ -614,13 +575,7 @@ static const struct bd71828_regulator_data bd71828_rdata[] = {
                                     ROHM_DVS_LEVEL_SUSPEND |
                                     ROHM_DVS_LEVEL_LPSR,
                        .run_reg = BD71828_REG_LDO4_VOLT,
-                       .idle_reg = BD71828_REG_LDO4_VOLT,
-                       .suspend_reg = BD71828_REG_LDO4_VOLT,
-                       .lpsr_reg = BD71828_REG_LDO4_VOLT,
                        .run_mask = BD71828_MASK_LDO_VOLT,
-                       .idle_mask = BD71828_MASK_LDO_VOLT,
-                       .suspend_mask = BD71828_MASK_LDO_VOLT,
-                       .lpsr_mask = BD71828_MASK_LDO_VOLT,
                        .idle_on_mask = BD71828_MASK_IDLE_EN,
                        .suspend_on_mask = BD71828_MASK_SUSP_EN,
                        .lpsr_on_mask = BD71828_MASK_LPSR_EN,
@@ -655,13 +610,7 @@ static const struct bd71828_regulator_data bd71828_rdata[] = {
                                     ROHM_DVS_LEVEL_SUSPEND |
                                     ROHM_DVS_LEVEL_LPSR,
                        .run_reg = BD71828_REG_LDO5_VOLT,
-                       .idle_reg = BD71828_REG_LDO5_VOLT,
-                       .suspend_reg = BD71828_REG_LDO5_VOLT,
-                       .lpsr_reg = BD71828_REG_LDO5_VOLT,
                        .run_mask = BD71828_MASK_LDO_VOLT,
-                       .idle_mask = BD71828_MASK_LDO_VOLT,
-                       .suspend_mask = BD71828_MASK_LDO_VOLT,
-                       .lpsr_mask = BD71828_MASK_LDO_VOLT,
                        .idle_on_mask = BD71828_MASK_IDLE_EN,
                        .suspend_on_mask = BD71828_MASK_SUSP_EN,
                        .lpsr_on_mask = BD71828_MASK_LPSR_EN,
@@ -720,9 +669,6 @@ static const struct bd71828_regulator_data bd71828_rdata[] = {
                        .suspend_reg = BD71828_REG_LDO7_VOLT,
                        .lpsr_reg = BD71828_REG_LDO7_VOLT,
                        .run_mask = BD71828_MASK_LDO_VOLT,
-                       .idle_mask = BD71828_MASK_LDO_VOLT,
-                       .suspend_mask = BD71828_MASK_LDO_VOLT,
-                       .lpsr_mask = BD71828_MASK_LDO_VOLT,
                        .idle_on_mask = BD71828_MASK_IDLE_EN,
                        .suspend_on_mask = BD71828_MASK_SUSP_EN,
                        .lpsr_on_mask = BD71828_MASK_LPSR_EN,