diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-10-06 10:33:52 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-10-06 10:33:52 -0400 |
| commit | 0fd0ba5f9e8ebae66afded580f5f34936f740ac7 (patch) | |
| tree | f232be1bf350b2aec4e860e7156f5292344b0c62 /drivers/extcon/extcon-arizona.c | |
| parent | b7ef37d0e382298bcf7ba399ce67b044d9add23a (diff) | |
| parent | 9911f7f7562a25381eff93fdc660a4a3b4c0f6e0 (diff) | |
Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Additional updates for v3.7
A couple more updates for 3.7, enhancements to the ux500 and wm2000
drivers, a new driver for DA9055 and the support for regulator bypass
mode. With the exception of the DA9055 this has all had a chance to
soak in -next (the driver was added on Friday so should be in -next
today).
Diffstat (limited to 'drivers/extcon/extcon-arizona.c')
| -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 427a289f32a5..6c19833ed2d0 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) | |||
| 434 | regmap_update_bits(arizona->regmap, ARIZONA_JACK_DETECT_ANALOGUE, | 434 | regmap_update_bits(arizona->regmap, ARIZONA_JACK_DETECT_ANALOGUE, |
| 435 | ARIZONA_JD1_ENA, ARIZONA_JD1_ENA); | 435 | ARIZONA_JD1_ENA, ARIZONA_JD1_ENA); |
| 436 | 436 | ||
| 437 | ret = regulator_allow_bypass(info->micvdd, true); | ||
| 438 | if (ret != 0) | ||
| 439 | dev_warn(arizona->dev, "Failed to set MICVDD to bypass: %d\n", | ||
| 440 | ret); | ||
| 441 | |||
| 437 | pm_runtime_put(&pdev->dev); | 442 | pm_runtime_put(&pdev->dev); |
| 438 | 443 | ||
| 439 | return 0; | 444 | return 0; |