* [PATCH 1/2] ASoC: Fix WM8958 default microphone detection argument ordering
@ 2011-02-22 4:52 Mark Brown
2011-02-22 4:52 ` [PATCH 2/2] ASoC: Simplify default WM8958 jack detection code Mark Brown
2011-02-22 9:42 ` [PATCH 1/2] ASoC: Fix WM8958 default microphone detection argument ordering Liam Girdwood
0 siblings, 2 replies; 3+ messages in thread
From: Mark Brown @ 2011-02-22 4:52 UTC (permalink / raw)
To: Liam Girdwood; +Cc: alsa-devel, patches, Mark Brown
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
sound/soc/codecs/wm8994.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 4df047e..5f16870 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -3012,11 +3012,10 @@ static void wm8958_default_micdet(u16 status, void *data)
report |= SND_JACK_BTN_5;
done:
- snd_soc_jack_report(wm8994->micdet[0].jack,
+ snd_soc_jack_report(wm8994->micdet[0].jack, report,
SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2 |
SND_JACK_BTN_3 | SND_JACK_BTN_4 | SND_JACK_BTN_5 |
- SND_JACK_MICROPHONE | SND_JACK_VIDEOOUT,
- report);
+ SND_JACK_MICROPHONE | SND_JACK_VIDEOOUT);
}
/**
--
1.7.2.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] ASoC: Simplify default WM8958 jack detection code
2011-02-22 4:52 [PATCH 1/2] ASoC: Fix WM8958 default microphone detection argument ordering Mark Brown
@ 2011-02-22 4:52 ` Mark Brown
2011-02-22 9:42 ` [PATCH 1/2] ASoC: Fix WM8958 default microphone detection argument ordering Liam Girdwood
1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2011-02-22 4:52 UTC (permalink / raw)
To: Liam Girdwood; +Cc: alsa-devel, patches, Mark Brown
The default WM8958 jack detection handler implements a full set of buttons
and also support for video detection. Support for multi-button jacks is
fairly system specific and will usually require some tuning for headsets
so simplify the implementation to only report a simple short to ground
button, leaving multi-button headsets to be handled by system specific
code.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
sound/soc/codecs/wm8994.c | 38 ++++----------------------------------
1 files changed, 4 insertions(+), 34 deletions(-)
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 5f16870..42e5ebe 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -102,8 +102,6 @@ struct wm8994_priv {
wm8958_micdet_cb jack_cb;
void *jack_cb_data;
- bool jack_is_mic;
- bool jack_is_video;
int micdet_irq;
int revision;
@@ -2976,46 +2974,18 @@ static void wm8958_default_micdet(u16 status, void *data)
int report = 0;
/* If nothing present then clear our statuses */
- if (!(status & WM8958_MICD_STS)) {
- wm8994->jack_is_video = false;
- wm8994->jack_is_mic = false;
+ if (!(status & WM8958_MICD_STS))
goto done;
- }
-
- /* Assume anything over 475 ohms is a microphone and remember
- * that we've seen one (since buttons override it) */
- if (status & 0x600)
- wm8994->jack_is_mic = true;
- if (wm8994->jack_is_mic)
- report |= SND_JACK_MICROPHONE;
- /* Video has an impedence of approximately 75 ohms; assume
- * this isn't used as a button and remember it since buttons
- * override it. */
- if (status & 0x40)
- wm8994->jack_is_video = true;
- if (wm8994->jack_is_video)
- report |= SND_JACK_VIDEOOUT;
+ report = SND_JACK_MICROPHONE;
/* Everything else is buttons; just assign slots */
- if (status & 0x4)
+ if (status & 0x1c0)
report |= SND_JACK_BTN_0;
- if (status & 0x8)
- report |= SND_JACK_BTN_1;
- if (status & 0x10)
- report |= SND_JACK_BTN_2;
- if (status & 0x20)
- report |= SND_JACK_BTN_3;
- if (status & 0x80)
- report |= SND_JACK_BTN_4;
- if (status & 0x100)
- report |= SND_JACK_BTN_5;
done:
snd_soc_jack_report(wm8994->micdet[0].jack, report,
- SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2 |
- SND_JACK_BTN_3 | SND_JACK_BTN_4 | SND_JACK_BTN_5 |
- SND_JACK_MICROPHONE | SND_JACK_VIDEOOUT);
+ SND_JACK_BTN_0 | SND_JACK_MICROPHONE);
}
/**
--
1.7.2.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] ASoC: Fix WM8958 default microphone detection argument ordering
2011-02-22 4:52 [PATCH 1/2] ASoC: Fix WM8958 default microphone detection argument ordering Mark Brown
2011-02-22 4:52 ` [PATCH 2/2] ASoC: Simplify default WM8958 jack detection code Mark Brown
@ 2011-02-22 9:42 ` Liam Girdwood
1 sibling, 0 replies; 3+ messages in thread
From: Liam Girdwood @ 2011-02-22 9:42 UTC (permalink / raw)
To: Mark Brown; +Cc: alsa-devel, patches
On Tue, 2011-02-22 at 04:52 +0000, Mark Brown wrote:
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
> sound/soc/codecs/wm8994.c | 5 ++---
> 1 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
> index 4df047e..5f16870 100644
> --- a/sound/soc/codecs/wm8994.c
> +++ b/sound/soc/codecs/wm8994.c
> @@ -3012,11 +3012,10 @@ static void wm8958_default_micdet(u16 status, void *data)
> report |= SND_JACK_BTN_5;
>
> done:
> - snd_soc_jack_report(wm8994->micdet[0].jack,
> + snd_soc_jack_report(wm8994->micdet[0].jack, report,
> SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2 |
> SND_JACK_BTN_3 | SND_JACK_BTN_4 | SND_JACK_BTN_5 |
> - SND_JACK_MICROPHONE | SND_JACK_VIDEOOUT,
> - report);
> + SND_JACK_MICROPHONE | SND_JACK_VIDEOOUT);
> }
>
> /**
both
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-02-22 9:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-22 4:52 [PATCH 1/2] ASoC: Fix WM8958 default microphone detection argument ordering Mark Brown
2011-02-22 4:52 ` [PATCH 2/2] ASoC: Simplify default WM8958 jack detection code Mark Brown
2011-02-22 9:42 ` [PATCH 1/2] ASoC: Fix WM8958 default microphone detection argument ordering Liam Girdwood
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).