diff options
author | Axel Lin <axel.lin@gmail.com> | 2011-05-10 07:10:36 -0400 |
---|---|---|
committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2011-05-27 05:49:09 -0400 |
commit | 327e15af15248563c896c16adad6fc6e04bb5a4d (patch) | |
tree | 8d0d3b3772c7a55b410e72339be6a5132f710f3c /drivers/regulator/mc13892-regulator.c | |
parent | cda53103284f87a8f2c1eb5b075131c2bd45bc95 (diff) |
Revert "regulator: Move VCOINCELL to be the last element of mc13892_regulators array"
I check this patch again and found this actually is not a bug
because MC13xxx_DEFINE explictly defines the order of each entry in the array.
Thus revert the patch.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'drivers/regulator/mc13892-regulator.c')
-rw-r--r-- | drivers/regulator/mc13892-regulator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c index c1ed67ec5148..33d43b26d53b 100644 --- a/drivers/regulator/mc13892-regulator.c +++ b/drivers/regulator/mc13892-regulator.c | |||
@@ -259,6 +259,7 @@ static struct regulator_ops mc13892_sw_regulator_ops; | |||
259 | mc13xxx_regulator_ops) | 259 | mc13xxx_regulator_ops) |
260 | 260 | ||
261 | static struct mc13xxx_regulator mc13892_regulators[] = { | 261 | static struct mc13xxx_regulator mc13892_regulators[] = { |
262 | MC13892_DEFINE_REGU(VCOINCELL, POWERCTL0, POWERCTL0, mc13892_vcoincell), | ||
262 | MC13892_SW_DEFINE(SW1, SWITCHERS0, SWITCHERS0, mc13892_sw1), | 263 | MC13892_SW_DEFINE(SW1, SWITCHERS0, SWITCHERS0, mc13892_sw1), |
263 | MC13892_SW_DEFINE(SW2, SWITCHERS1, SWITCHERS1, mc13892_sw), | 264 | MC13892_SW_DEFINE(SW2, SWITCHERS1, SWITCHERS1, mc13892_sw), |
264 | MC13892_SW_DEFINE(SW3, SWITCHERS2, SWITCHERS2, mc13892_sw), | 265 | MC13892_SW_DEFINE(SW3, SWITCHERS2, SWITCHERS2, mc13892_sw), |
@@ -292,7 +293,6 @@ static struct mc13xxx_regulator mc13892_regulators[] = { | |||
292 | MC13892_GPO_DEFINE(GPO4, POWERMISC, mc13892_gpo), | 293 | MC13892_GPO_DEFINE(GPO4, POWERMISC, mc13892_gpo), |
293 | MC13892_GPO_DEFINE(PWGT1SPI, POWERMISC, mc13892_pwgtdrv), | 294 | MC13892_GPO_DEFINE(PWGT1SPI, POWERMISC, mc13892_pwgtdrv), |
294 | MC13892_GPO_DEFINE(PWGT2SPI, POWERMISC, mc13892_pwgtdrv), | 295 | MC13892_GPO_DEFINE(PWGT2SPI, POWERMISC, mc13892_pwgtdrv), |
295 | MC13892_DEFINE_REGU(VCOINCELL, POWERCTL0, POWERCTL0, mc13892_vcoincell), | ||
296 | }; | 296 | }; |
297 | 297 | ||
298 | static int mc13892_powermisc_rmw(struct mc13xxx_regulator_priv *priv, u32 mask, | 298 | static int mc13892_powermisc_rmw(struct mc13xxx_regulator_priv *priv, u32 mask, |