Commit 93083725 authored by Yang Yingliang's avatar Yang Yingliang Committed by Mark Brown

regulator: max77857: fix build error in max77857-regulator.c

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: af71ccca ("regulator: max77857: Add ADI MAX77857/59/MAX77831 Regulator Support")
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20230803113654.818640-1-yangyingliang@huawei.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 22475bcc
...@@ -293,8 +293,10 @@ static const unsigned int max77857_switch_freq[] = { ...@@ -293,8 +293,10 @@ static const unsigned int max77857_switch_freq[] = {
1200000, 1500000, 1800000, 2100000 1200000, 1500000, 1800000, 2100000
}; };
#define RAMAP_DELAY_INIT_VAL 1333
static const unsigned int max77857_ramp_table[2][4] = { 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 */ { 1166, 667, 333, 167 }, /* when switch freq is 1.2MHz or 1.5MHz */
}; };
...@@ -309,7 +311,7 @@ static struct regulator_desc max77857_regulator_desc = { ...@@ -309,7 +311,7 @@ static struct regulator_desc max77857_regulator_desc = {
.n_ramp_values = ARRAY_SIZE(max77857_ramp_table[0]), .n_ramp_values = ARRAY_SIZE(max77857_ramp_table[0]),
.ramp_reg = MAX77857_REG_CONT3, .ramp_reg = MAX77857_REG_CONT3,
.ramp_mask = GENMASK(1, 0), .ramp_mask = GENMASK(1, 0),
.ramp_delay = max77857_ramp_table[0][0], .ramp_delay = RAMAP_DELAY_INIT_VAL,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment