---

yaml --- r: 312611 b: refs/heads/master c: 6dc027c h: refs/heads/master i: 312609: b3d0db6 312607: 3ee5bf6 v: v3
git-mirror · Jul 4, 2012 · b4af9e0 · b4af9e0
1 parent deae337
commit b4af9e0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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);