Received-SPF: pass (google.com: domain of linux-kernel+bounces-180800-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Thu, 16 May 2024 11:54:41 +0300
From: Matti Vaittinen <mazziesaccount@gmail.com>
To: Matti Vaittinen <mazziesaccount@gmail.com>,
	Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
Cc: Matti Vaittinen <mazziesaccount@gmail.com>,
	Liam Girdwood <lgirdwood@gmail.com>,
	Mark Brown <broonie@kernel.org>, linux-kernel@vger.kernel.org
Subject: [PATCH 2/3] regulator: bd71828: Don't overwrite runtime voltages
Message-ID: <e1883ae1e3ae5668f1030455d4750923561f3d68.1715848512.git.mazziesaccount@gmail.com>
References: <cover.1715848512.git.mazziesaccount@gmail.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
	protocol="application/pgp-signature"; boundary="ju4vgvCpkoEaiHHL"
Content-Disposition: inline
In-Reply-To: <cover.1715848512.git.mazziesaccount@gmail.com>


--ju4vgvCpkoEaiHHL
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

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 PM=
IC regulators")
---
 drivers/regulator/bd71828-regulator.c | 58 +--------------------------
 1 file changed, 2 insertions(+), 56 deletions(-)

diff --git a/drivers/regulator/bd71828-regulator.c b/drivers/regulator/bd71=
828-regulator.c
index 08d4ee369287..dd871ffe979c 100644
--- a/drivers/regulator/bd71828-regulator.c
+++ b/drivers/regulator/bd71828-regulator.c
@@ -206,14 +206,11 @@ static const struct bd71828_regulator_data bd71828_rd=
ata[] =3D {
 			.suspend_reg =3D BD71828_REG_BUCK1_SUSP_VOLT,
 			.suspend_mask =3D BD71828_MASK_BUCK1267_VOLT,
 			.suspend_on_mask =3D BD71828_MASK_SUSP_EN,
-			.lpsr_on_mask =3D 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 =3D BD71828_REG_BUCK1_SUSP_VOLT,
-			.lpsr_mask =3D BD71828_MASK_BUCK1267_VOLT,
+			.lpsr_on_mask =3D BD71828_MASK_LPSR_EN,
 		},
 		.reg_inits =3D buck1_inits,
 		.reg_init_amnt =3D ARRAY_SIZE(buck1_inits),
@@ -288,13 +285,7 @@ static const struct bd71828_regulator_data bd71828_rda=
ta[] =3D {
 				     ROHM_DVS_LEVEL_SUSPEND |
 				     ROHM_DVS_LEVEL_LPSR,
 			.run_reg =3D BD71828_REG_BUCK3_VOLT,
-			.idle_reg =3D BD71828_REG_BUCK3_VOLT,
-			.suspend_reg =3D BD71828_REG_BUCK3_VOLT,
-			.lpsr_reg =3D BD71828_REG_BUCK3_VOLT,
 			.run_mask =3D BD71828_MASK_BUCK3_VOLT,
-			.idle_mask =3D BD71828_MASK_BUCK3_VOLT,
-			.suspend_mask =3D BD71828_MASK_BUCK3_VOLT,
-			.lpsr_mask =3D BD71828_MASK_BUCK3_VOLT,
 			.idle_on_mask =3D BD71828_MASK_IDLE_EN,
 			.suspend_on_mask =3D BD71828_MASK_SUSP_EN,
 			.lpsr_on_mask =3D BD71828_MASK_LPSR_EN,
@@ -329,13 +320,7 @@ static const struct bd71828_regulator_data bd71828_rda=
ta[] =3D {
 				     ROHM_DVS_LEVEL_SUSPEND |
 				     ROHM_DVS_LEVEL_LPSR,
 			.run_reg =3D BD71828_REG_BUCK4_VOLT,
-			.idle_reg =3D BD71828_REG_BUCK4_VOLT,
-			.suspend_reg =3D BD71828_REG_BUCK4_VOLT,
-			.lpsr_reg =3D BD71828_REG_BUCK4_VOLT,
 			.run_mask =3D BD71828_MASK_BUCK4_VOLT,
-			.idle_mask =3D BD71828_MASK_BUCK4_VOLT,
-			.suspend_mask =3D BD71828_MASK_BUCK4_VOLT,
-			.lpsr_mask =3D BD71828_MASK_BUCK4_VOLT,
 			.idle_on_mask =3D BD71828_MASK_IDLE_EN,
 			.suspend_on_mask =3D BD71828_MASK_SUSP_EN,
 			.lpsr_on_mask =3D BD71828_MASK_LPSR_EN,
@@ -370,13 +355,7 @@ static const struct bd71828_regulator_data bd71828_rda=
ta[] =3D {
 				     ROHM_DVS_LEVEL_SUSPEND |
 				     ROHM_DVS_LEVEL_LPSR,
 			.run_reg =3D BD71828_REG_BUCK5_VOLT,
-			.idle_reg =3D BD71828_REG_BUCK5_VOLT,
-			.suspend_reg =3D BD71828_REG_BUCK5_VOLT,
-			.lpsr_reg =3D BD71828_REG_BUCK5_VOLT,
 			.run_mask =3D BD71828_MASK_BUCK5_VOLT,
-			.idle_mask =3D BD71828_MASK_BUCK5_VOLT,
-			.suspend_mask =3D BD71828_MASK_BUCK5_VOLT,
-			.lpsr_mask =3D BD71828_MASK_BUCK5_VOLT,
 			.idle_on_mask =3D BD71828_MASK_IDLE_EN,
 			.suspend_on_mask =3D BD71828_MASK_SUSP_EN,
 			.lpsr_on_mask =3D BD71828_MASK_LPSR_EN,
@@ -493,13 +472,7 @@ static const struct bd71828_regulator_data bd71828_rda=
ta[] =3D {
 				     ROHM_DVS_LEVEL_SUSPEND |
 				     ROHM_DVS_LEVEL_LPSR,
 			.run_reg =3D BD71828_REG_LDO1_VOLT,
-			.idle_reg =3D BD71828_REG_LDO1_VOLT,
-			.suspend_reg =3D BD71828_REG_LDO1_VOLT,
-			.lpsr_reg =3D BD71828_REG_LDO1_VOLT,
 			.run_mask =3D BD71828_MASK_LDO_VOLT,
-			.idle_mask =3D BD71828_MASK_LDO_VOLT,
-			.suspend_mask =3D BD71828_MASK_LDO_VOLT,
-			.lpsr_mask =3D BD71828_MASK_LDO_VOLT,
 			.idle_on_mask =3D BD71828_MASK_IDLE_EN,
 			.suspend_on_mask =3D BD71828_MASK_SUSP_EN,
 			.lpsr_on_mask =3D BD71828_MASK_LPSR_EN,
@@ -533,13 +506,7 @@ static const struct bd71828_regulator_data bd71828_rda=
ta[] =3D {
 				     ROHM_DVS_LEVEL_SUSPEND |
 				     ROHM_DVS_LEVEL_LPSR,
 			.run_reg =3D BD71828_REG_LDO2_VOLT,
-			.idle_reg =3D BD71828_REG_LDO2_VOLT,
-			.suspend_reg =3D BD71828_REG_LDO2_VOLT,
-			.lpsr_reg =3D BD71828_REG_LDO2_VOLT,
 			.run_mask =3D BD71828_MASK_LDO_VOLT,
-			.idle_mask =3D BD71828_MASK_LDO_VOLT,
-			.suspend_mask =3D BD71828_MASK_LDO_VOLT,
-			.lpsr_mask =3D BD71828_MASK_LDO_VOLT,
 			.idle_on_mask =3D BD71828_MASK_IDLE_EN,
 			.suspend_on_mask =3D BD71828_MASK_SUSP_EN,
 			.lpsr_on_mask =3D BD71828_MASK_LPSR_EN,
@@ -573,13 +540,7 @@ static const struct bd71828_regulator_data bd71828_rda=
ta[] =3D {
 				     ROHM_DVS_LEVEL_SUSPEND |
 				     ROHM_DVS_LEVEL_LPSR,
 			.run_reg =3D BD71828_REG_LDO3_VOLT,
-			.idle_reg =3D BD71828_REG_LDO3_VOLT,
-			.suspend_reg =3D BD71828_REG_LDO3_VOLT,
-			.lpsr_reg =3D BD71828_REG_LDO3_VOLT,
 			.run_mask =3D BD71828_MASK_LDO_VOLT,
-			.idle_mask =3D BD71828_MASK_LDO_VOLT,
-			.suspend_mask =3D BD71828_MASK_LDO_VOLT,
-			.lpsr_mask =3D BD71828_MASK_LDO_VOLT,
 			.idle_on_mask =3D BD71828_MASK_IDLE_EN,
 			.suspend_on_mask =3D BD71828_MASK_SUSP_EN,
 			.lpsr_on_mask =3D BD71828_MASK_LPSR_EN,
@@ -614,13 +575,7 @@ static const struct bd71828_regulator_data bd71828_rda=
ta[] =3D {
 				     ROHM_DVS_LEVEL_SUSPEND |
 				     ROHM_DVS_LEVEL_LPSR,
 			.run_reg =3D BD71828_REG_LDO4_VOLT,
-			.idle_reg =3D BD71828_REG_LDO4_VOLT,
-			.suspend_reg =3D BD71828_REG_LDO4_VOLT,
-			.lpsr_reg =3D BD71828_REG_LDO4_VOLT,
 			.run_mask =3D BD71828_MASK_LDO_VOLT,
-			.idle_mask =3D BD71828_MASK_LDO_VOLT,
-			.suspend_mask =3D BD71828_MASK_LDO_VOLT,
-			.lpsr_mask =3D BD71828_MASK_LDO_VOLT,
 			.idle_on_mask =3D BD71828_MASK_IDLE_EN,
 			.suspend_on_mask =3D BD71828_MASK_SUSP_EN,
 			.lpsr_on_mask =3D BD71828_MASK_LPSR_EN,
@@ -655,13 +610,7 @@ static const struct bd71828_regulator_data bd71828_rda=
ta[] =3D {
 				     ROHM_DVS_LEVEL_SUSPEND |
 				     ROHM_DVS_LEVEL_LPSR,
 			.run_reg =3D BD71828_REG_LDO5_VOLT,
-			.idle_reg =3D BD71828_REG_LDO5_VOLT,
-			.suspend_reg =3D BD71828_REG_LDO5_VOLT,
-			.lpsr_reg =3D BD71828_REG_LDO5_VOLT,
 			.run_mask =3D BD71828_MASK_LDO_VOLT,
-			.idle_mask =3D BD71828_MASK_LDO_VOLT,
-			.suspend_mask =3D BD71828_MASK_LDO_VOLT,
-			.lpsr_mask =3D BD71828_MASK_LDO_VOLT,
 			.idle_on_mask =3D BD71828_MASK_IDLE_EN,
 			.suspend_on_mask =3D BD71828_MASK_SUSP_EN,
 			.lpsr_on_mask =3D BD71828_MASK_LPSR_EN,
@@ -720,9 +669,6 @@ static const struct bd71828_regulator_data bd71828_rdat=
a[] =3D {
 			.suspend_reg =3D BD71828_REG_LDO7_VOLT,
 			.lpsr_reg =3D BD71828_REG_LDO7_VOLT,
 			.run_mask =3D BD71828_MASK_LDO_VOLT,
-			.idle_mask =3D BD71828_MASK_LDO_VOLT,
-			.suspend_mask =3D BD71828_MASK_LDO_VOLT,
-			.lpsr_mask =3D BD71828_MASK_LDO_VOLT,
 			.idle_on_mask =3D BD71828_MASK_IDLE_EN,
 			.suspend_on_mask =3D BD71828_MASK_SUSP_EN,
 			.lpsr_on_mask =3D BD71828_MASK_LPSR_EN,
--=20
2.44.0


--=20
Matti Vaittinen, Linux device drivers
ROHM Semiconductors, Finland SWDC
Kiviharjunlenkki 1E
90220 OULU
FINLAND

~~~ "I don't think so," said Rene Descartes. Just then he vanished ~~~
Simon says - in Latin please.
~~~ "non cogito me" dixit Rene Descarte, deinde evanescavit ~~~
Thanks to Simon Glass for the translation =3D]=20

--ju4vgvCpkoEaiHHL
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEEIx+f8wZb28fLKEhTeFA3/03aocUFAmZFydAACgkQeFA3/03a
ocWC5AgAipXd6MonmP0kzeRELFJtK6OA67RbNRKmxM/6wp1Mm5wdYEXVQMXlP26O
OIyyDnyzt0gf+eogfo/VwYOVjxpg7GBYGBD82Swik8NcDdoXYTjYxMyD2WwauJWZ
ISHNkigHIj9rul/3xotzBjfuKDr+Apero8B/8vFHKkdY7KJaul+rk6xN/D/2UCd3
1tqbtA9FjaqS9rm7uozYnVyJnepdL+vbbEgLZzkTfTPzYhH44HXzQy5NE6ekLyIj
FknwW4pJsl6msxT4H0gqLnV0FwNxIhEzjjYJpZwB5xcgFesNLcBJ7/tNLBAolxBa
GUlEWYC20mSSjq/LcbFoC+C0XDH3oQ==
=d9y3
-----END PGP SIGNATURE-----

--ju4vgvCpkoEaiHHL--