From b4af9e03d310b17787ca7e4d297dfbd82027992d Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Wed, 4 Jul 2012 12:50:02 +0100 Subject: [PATCH] --- yaml --- r: 312611 b: refs/heads/master c: 6dc027c977a0cf34828ebb1742cc58fa9adb0e2f h: refs/heads/master i: 312609: b3d0db6549b5489f5dc9a9b3588d57390908c0d4 312607: 3ee5bf6476d035318ee279789982c386d0daae02 v: v3 --- [refs] | 2 +- trunk/drivers/regulator/arizona-micsupp.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a26b67a5ce55..08fda773d1c9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9c6a74c5e0ca3bfac09cb1e7bf7629cc0f3aa48c +refs/heads/master: 6dc027c977a0cf34828ebb1742cc58fa9adb0e2f diff --git a/trunk/drivers/regulator/arizona-micsupp.c b/trunk/drivers/regulator/arizona-micsupp.c index fdd7473ada4a..450a069aa9b6 100644 --- a/trunk/drivers/regulator/arizona-micsupp.c +++ b/trunk/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);