Commit 609b06f3 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ASoC: Ensure supplies are maintained for force enabled widgets
  ASoC: WM8994: Improve playback robustness
  ASoC: WM8994: Improve robustness in some use cases
  ASoC: WM8903: Fix mic detection enable logic
  ASoC: WM8903: Fix mic detection register definitions
  ASoC: CX20442: fix wrong reg_cache_default content
  ASoC: Sync initial widget state with hardware
parents 790e10ba 3017358a
...@@ -17,13 +17,9 @@ ...@@ -17,13 +17,9 @@
/* /*
* R6 (0x06) - Mic Bias Control 0 * R6 (0x06) - Mic Bias Control 0
*/ */
#define WM8903_MICDET_HYST_ENA 0x0080 /* MICDET_HYST_ENA */ #define WM8903_MICDET_THR_MASK 0x0030 /* MICDET_THR - [5:4] */
#define WM8903_MICDET_HYST_ENA_MASK 0x0080 /* MICDET_HYST_ENA */ #define WM8903_MICDET_THR_SHIFT 4 /* MICDET_THR - [5:4] */
#define WM8903_MICDET_HYST_ENA_SHIFT 7 /* MICDET_HYST_ENA */ #define WM8903_MICDET_THR_WIDTH 2 /* MICDET_THR - [5:4] */
#define WM8903_MICDET_HYST_ENA_WIDTH 1 /* MICDET_HYST_ENA */
#define WM8903_MICDET_THR_MASK 0x0070 /* MICDET_THR - [6:4] */
#define WM8903_MICDET_THR_SHIFT 4 /* MICDET_THR - [6:4] */
#define WM8903_MICDET_THR_WIDTH 3 /* MICDET_THR - [6:4] */
#define WM8903_MICSHORT_THR_MASK 0x000C /* MICSHORT_THR - [3:2] */ #define WM8903_MICSHORT_THR_MASK 0x000C /* MICSHORT_THR - [3:2] */
#define WM8903_MICSHORT_THR_SHIFT 2 /* MICSHORT_THR - [3:2] */ #define WM8903_MICSHORT_THR_SHIFT 2 /* MICSHORT_THR - [3:2] */
#define WM8903_MICSHORT_THR_WIDTH 2 /* MICSHORT_THR - [3:2] */ #define WM8903_MICSHORT_THR_WIDTH 2 /* MICSHORT_THR - [3:2] */
......
...@@ -367,7 +367,7 @@ static int cx20442_codec_remove(struct snd_soc_codec *codec) ...@@ -367,7 +367,7 @@ static int cx20442_codec_remove(struct snd_soc_codec *codec)
return 0; return 0;
} }
static const u8 cx20442_reg = CX20442_TELOUT | CX20442_MIC; static const u8 cx20442_reg;
static struct snd_soc_codec_driver cx20442_codec_dev = { static struct snd_soc_codec_driver cx20442_codec_dev = {
.probe = cx20442_codec_probe, .probe = cx20442_codec_probe,
......
...@@ -1482,7 +1482,7 @@ int wm8903_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack, ...@@ -1482,7 +1482,7 @@ int wm8903_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack,
WM8903_MICDET_EINT | WM8903_MICSHRT_EINT, WM8903_MICDET_EINT | WM8903_MICSHRT_EINT,
irq_mask); irq_mask);
if (det && shrt) { if (det || shrt) {
/* Enable mic detection, this may not have been set through /* Enable mic detection, this may not have been set through
* platform data (eg, if the defaults are OK). */ * platform data (eg, if the defaults are OK). */
snd_soc_update_bits(codec, WM8903_WRITE_SEQUENCER_0, snd_soc_update_bits(codec, WM8903_WRITE_SEQUENCER_0,
......
This diff is collapsed.
...@@ -712,7 +712,15 @@ static int dapm_supply_check_power(struct snd_soc_dapm_widget *w) ...@@ -712,7 +712,15 @@ static int dapm_supply_check_power(struct snd_soc_dapm_widget *w)
!path->connected(path->source, path->sink)) !path->connected(path->source, path->sink))
continue; continue;
if (path->sink && path->sink->power_check && if (!path->sink)
continue;
if (path->sink->force) {
power = 1;
break;
}
if (path->sink->power_check &&
path->sink->power_check(path->sink)) { path->sink->power_check(path->sink)) {
power = 1; power = 1;
break; break;
...@@ -1627,6 +1635,7 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_add_routes); ...@@ -1627,6 +1635,7 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_add_routes);
int snd_soc_dapm_new_widgets(struct snd_soc_dapm_context *dapm) int snd_soc_dapm_new_widgets(struct snd_soc_dapm_context *dapm)
{ {
struct snd_soc_dapm_widget *w; struct snd_soc_dapm_widget *w;
unsigned int val;
list_for_each_entry(w, &dapm->card->widgets, list) list_for_each_entry(w, &dapm->card->widgets, list)
{ {
...@@ -1675,6 +1684,18 @@ int snd_soc_dapm_new_widgets(struct snd_soc_dapm_context *dapm) ...@@ -1675,6 +1684,18 @@ int snd_soc_dapm_new_widgets(struct snd_soc_dapm_context *dapm)
case snd_soc_dapm_post: case snd_soc_dapm_post:
break; break;
} }
/* Read the initial power state from the device */
if (w->reg >= 0) {
val = snd_soc_read(w->codec, w->reg);
val &= 1 << w->shift;
if (w->invert)
val = !val;
if (val)
w->power = 1;
}
w->new = 1; w->new = 1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment