Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba413c59 authored by Axel Lin's avatar Axel Lin Committed by Liam Girdwood
Browse files

regulator: Move VCOINCELL to be the last element of mc13892_regulators array 



In include/linux/mfd/mc13892.h, we define MC13892_VCOINCELL as 23.
Thus VCOINCELL should be defined as 23th element in mc13892_regulators array, not the first one.
This actually fixes an off-by-one bug while accessing mc13892_regulators array.

For example,
In mc13892_regulator_probe, we use MC13892_VCAM as array index of mc13892_regulators array.
        mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
                = mc13892_vcam_set_mode;
Currently, it access mc13892_regulators[12] ,which is VAUDIO not VCAM.

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent 82d15839

drivers/regulator/mc13892-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,6 @@ static struct regulator_ops mc13892_sw_regulator_ops; 
			mc13xxx_regulator_ops)



static struct mc13xxx_regulator mc13892_regulators[] = {

	MC13892_DEFINE_REGU(VCOINCELL, POWERCTL0, POWERCTL0, mc13892_vcoincell),

	MC13892_SW_DEFINE(SW1, SWITCHERS0, SWITCHERS0, mc13892_sw1),

	MC13892_SW_DEFINE(SW2, SWITCHERS1, SWITCHERS1, mc13892_sw),

	MC13892_SW_DEFINE(SW3, SWITCHERS2, SWITCHERS2, mc13892_sw),
@@ -293,6 +292,7 @@ static struct mc13xxx_regulator mc13892_regulators[] = { 
	MC13892_GPO_DEFINE(GPO4, POWERMISC, mc13892_gpo),

	MC13892_GPO_DEFINE(PWGT1SPI, POWERMISC, mc13892_pwgtdrv),

	MC13892_GPO_DEFINE(PWGT2SPI, POWERMISC, mc13892_pwgtdrv),

	MC13892_DEFINE_REGU(VCOINCELL, POWERCTL0, POWERCTL0, mc13892_vcoincell),

};



static int mc13892_powermisc_rmw(struct mc13xxx_regulator_priv *priv, u32 mask,