diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-04 12:50:02 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-04 16:22:39 +0100 |
commit | 6dc027c977a0cf34828ebb1742cc58fa9adb0e2f (patch) | |
tree | 3174e7ec71678a2b40c357eaec8b17f683c8f194 /drivers/regulator | |
parent | 9c6a74c5e0ca3bfac09cb1e7bf7629cc0f3aa48c (diff) | |
download | linux-3.10-6dc027c977a0cf34828ebb1742cc58fa9adb0e2f.tar.gz linux-3.10-6dc027c977a0cf34828ebb1742cc58fa9adb0e2f.tar.bz2 linux-3.10-6dc027c977a0cf34828ebb1742cc58fa9adb0e2f.zip |
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>
Diffstat (limited to 'drivers/regulator')
-rw-r--r-- | drivers/regulator/arizona-micsupp.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/regulator/arizona-micsupp.c b/drivers/regulator/arizona-micsupp.c index fdd7473ada4..450a069aa9b 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) else config.init_data = &micsupp->init_data; + /* Default to regulated mode until the API supports bypass */ + regmap_update_bits(arizona->regmap, ARIZONA_MIC_CHARGE_PUMP_1, + ARIZONA_CPMIC_BYPASS, 0); + micsupp->regulator = regulator_register(&arizona_micsupp, &config); if (IS_ERR(micsupp->regulator)) { ret = PTR_ERR(micsupp->regulator); |