regulator: arizona-micsupp: Force regulated mode until we have API support

[deliverable/linux.git] / drivers / regulator / arizona-micsupp.c

diff --git a/drivers/regulator/arizona-micsupp.c b/drivers/regulator/arizona-micsupp.c
index fdd7473ada4a39505d5e214a339c11e81feb3729..450a069aa9b6ae5cde873f896a4714aaa8e48272 100644 (file)
--- 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);