[PATCH -next] regulator: max77857: fix build error in max77857-regulator.c
From: Yang Yingliang
Date: Thu Aug 03 2023 - 07:40:01 EST
When using low verion gcc(7.5) to build the max77857-regulator driver,
got the following error:
drivers/regulator/max77857-regulator.c:312:16: error: initializer element is not constant
.ramp_delay = max77857_ramp_table[0][0],
To fix this by introducing a macro RAMAP_DELAY_INIT_VAL to define the
value of max77857_ramp_table[0[0].
Fixes: af71cccadece ("regulator: max77857: Add ADI MAX77857/59/MAX77831 Regulator Support")
Signed-off-by: Yang Yingliang <yangyingliang@xxxxxxxxxx>
---
I notice this build error has been in -next a while, and it hasn't been fixed yet,
so I tried to fix this. If it was already fixed in other way, ignore this patch.
---
drivers/regulator/max77857-regulator.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/regulator/max77857-regulator.c b/drivers/regulator/max77857-regulator.c
index f2141b5be780..44a510547318 100644
--- a/drivers/regulator/max77857-regulator.c
+++ b/drivers/regulator/max77857-regulator.c
@@ -293,8 +293,10 @@ static const unsigned int max77857_switch_freq[] = {
1200000, 1500000, 1800000, 2100000
};
+#define RAMAP_DELAY_INIT_VAL 1333
+
static const unsigned int max77857_ramp_table[2][4] = {
- { 1333, 667, 333, 227 }, /* when switch freq is 1.8MHz or 2.1MHz */
+ { RAMAP_DELAY_INIT_VAL, 667, 333, 227 }, /* when switch freq is 1.8MHz or 2.1MHz */
{ 1166, 667, 333, 167 }, /* when switch freq is 1.2MHz or 1.5MHz */
};
@@ -309,7 +311,7 @@ static struct regulator_desc max77857_regulator_desc = {
.n_ramp_values = ARRAY_SIZE(max77857_ramp_table[0]),
.ramp_reg = MAX77857_REG_CONT3,
.ramp_mask = GENMASK(1, 0),
- .ramp_delay = max77857_ramp_table[0][0],
+ .ramp_delay = RAMAP_DELAY_INIT_VAL,
.owner = THIS_MODULE,
};
--
2.25.1