aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-07-04 07:50:02 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-07-04 11:22:39 -0400
commit6dc027c977a0cf34828ebb1742cc58fa9adb0e2f (patch)
tree3174e7ec71678a2b40c357eaec8b17f683c8f194
parent9c6a74c5e0ca3bfac09cb1e7bf7629cc0f3aa48c (diff)
regulator: arizona-micsupp: Force regulated mode until we have API support
It's almost certainly what the user would expect. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--drivers/regulator/arizona-micsupp.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/regulator/arizona-micsupp.c b/drivers/regulator/arizona-micsupp.c
index fdd7473ada4a..450a069aa9b6 100644
--- a/drivers/regulator/arizona-micsupp.c
+++ b/drivers/regulator/arizona-micsupp.c
@@ -144,6 +144,10 @@ static __devinit int arizona_micsupp_probe(struct platform_device *pdev)
144 else 144 else
145 config.init_data = &micsupp->init_data; 145 config.init_data = &micsupp->init_data;
146 146
147 /* Default to regulated mode until the API supports bypass */
148 regmap_update_bits(arizona->regmap, ARIZONA_MIC_CHARGE_PUMP_1,
149 ARIZONA_CPMIC_BYPASS, 0);
150
147 micsupp->regulator = regulator_register(&arizona_micsupp, &config); 151 micsupp->regulator = regulator_register(&arizona_micsupp, &config);
148 if (IS_ERR(micsupp->regulator)) { 152 if (IS_ERR(micsupp->regulator)) {
149 ret = PTR_ERR(micsupp->regulator); 153 ret = PTR_ERR(micsupp->regulator);