diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2022-11-30 18:14:39 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2022-12-02 09:49:52 +0100 |
| commit | 26332d8866c7d1db1d9789da1b6554a04735ed29 (patch) | |
| tree | 1f731571d9476723d5673b6ac3afa249851a459c /drivers | |
| parent | cbb5ef3d18ba7dfed9324985ea70b6bd9203622f (diff) | |
| download | barebox-26332d8866c7d1db1d9789da1b6554a04735ed29.tar.gz barebox-26332d8866c7d1db1d9789da1b6554a04735ed29.tar.xz | |
regulator: rk808: fix misplaced DCDC_REG5
Driver was written to mimic existing stpmic1 regulator driver, which had
the implicit assumption of a 1:1 relationship between of_match_data and
regulator configuration with same indices.
Yet DCDC_REG5 was not at the same place it was in the rk_regulator_cfg
due to likely a copy-paste mistake, leading to possibly the wrong
regulators being controlled. Fix this.
Reported-by: Michael Riesch <michael.riesch@wolfvision.net>
Suggested-by: Michael Riesch <michael.riesch@wolfvision.net>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Reviewed-by: Michael Riesch <michael.riesch@wolfvision.net>
Link: https://lore.barebox.org/20221130171439.2928344-1-a.fatoum@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/regulator/rk808-regulator.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/drivers/regulator/rk808-regulator.c b/drivers/regulator/rk808-regulator.c index 39eadbd3eb..f8bc31f354 100644 --- a/drivers/regulator/rk808-regulator.c +++ b/drivers/regulator/rk808-regulator.c @@ -526,19 +526,6 @@ static struct rk_regulator_cfg rk809_reg[] = { .enable_mask = ENABLE_MASK(RK817_ID_DCDC4), .enable_val = ENABLE_MASK(RK817_ID_DCDC4), .disable_val = DISABLE_VAL(RK817_ID_DCDC4), - }}, {{ - /* .name = "DCDC_REG5", */ - .supply_name = "vcc9", - .ops = &rk809_buck5_ops_range, - .n_voltages = RK809_BUCK5_SEL_CNT, - .linear_ranges = rk809_buck5_voltage_ranges, - .n_linear_ranges = ARRAY_SIZE(rk809_buck5_voltage_ranges), - .vsel_reg = RK809_BUCK5_CONFIG(0), - .vsel_mask = RK809_BUCK5_VSEL_MASK, - .enable_reg = RK817_POWER_EN_REG(3), - .enable_mask = ENABLE_MASK(1), - .enable_val = ENABLE_MASK(1), - .disable_val = DISABLE_VAL(1), }}, RK817_DESC(/* "LDO_REG1", */ "vcc5", 600, 3400, 25, RK817_LDO_ON_VSEL_REG(0), RK817_LDO_VSEL_MASK, @@ -576,6 +563,20 @@ static struct rk_regulator_cfg rk809_reg[] = { RK817_LDO_ON_VSEL_REG(8), RK817_LDO_VSEL_MASK, RK817_POWER_EN_REG(3), ENABLE_MASK(0), DISABLE_VAL(0), 400), + {{ + /* .name = "DCDC_REG5", */ + .supply_name = "vcc9", + .ops = &rk809_buck5_ops_range, + .n_voltages = RK809_BUCK5_SEL_CNT, + .linear_ranges = rk809_buck5_voltage_ranges, + .n_linear_ranges = ARRAY_SIZE(rk809_buck5_voltage_ranges), + .vsel_reg = RK809_BUCK5_CONFIG(0), + .vsel_mask = RK809_BUCK5_VSEL_MASK, + .enable_reg = RK817_POWER_EN_REG(3), + .enable_mask = ENABLE_MASK(1), + .enable_val = ENABLE_MASK(1), + .disable_val = DISABLE_VAL(1), + }}, RK817_DESC_SWITCH(/* "SWITCH_REG1", */ "vcc9", RK817_POWER_EN_REG(3), ENABLE_MASK(2), DISABLE_VAL(2)), RK817_DESC_SWITCH(/* "SWITCH_REG2", */ "vcc8", |