diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-26 11:29:31 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-26 11:29:31 (GMT) |
| commit | 8f6862d4bd6a7f936273d94ba58a25946365eac9 (patch) | |
| tree | fd27fef68e99913e70a7d0e48f6cc0eaea59dfdf /drivers/extcon | |
| parent | f76fe059dd5034c55c560d9e0005e19481843726 (diff) | |
| parent | b8575a1143f6d57a791c946291ba4363e07e32a3 (diff) | |
| download | linux-8f6862d4bd6a7f936273d94ba58a25946365eac9.tar.xz | |
Merge tag 'bypass' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into for-3.7
regulator: Bypass mode support
Allow regulators to be put into a non-regulating mode bypassing the
input straight to the output, mostly used by low power retention modes.
Diffstat (limited to 'drivers/extcon')
| -rw-r--r-- | drivers/extcon/extcon-arizona.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c index 427a289..6c19833 100644 --- a/drivers/extcon/extcon-arizona.c +++ b/drivers/extcon/extcon-arizona.c @@ -434,6 +434,11 @@ static int __devinit arizona_extcon_probe(struct platform_device *pdev) regmap_update_bits(arizona->regmap, ARIZONA_JACK_DETECT_ANALOGUE, ARIZONA_JD1_ENA, ARIZONA_JD1_ENA); + ret = regulator_allow_bypass(info->micvdd, true); + if (ret != 0) + dev_warn(arizona->dev, "Failed to set MICVDD to bypass: %d\n", + ret); + pm_runtime_put(&pdev->dev); return 0; |