Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
e9b54de4
Commit
e9b54de4
authored
May 09, 2012
by
Mark Brown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ASoC: wm8994: Add debounce to wm8994 mic detection
Signed-off-by:
Mark Brown
<
broonie@opensource.wolfsonmicro.com
>
parent
cbd71f30
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
7 deletions
+22
-7
sound/soc/codecs/wm8994.c
sound/soc/codecs/wm8994.c
+20
-7
sound/soc/codecs/wm8994.h
sound/soc/codecs/wm8994.h
+2
-0
No files found.
sound/soc/codecs/wm8994.c
View file @
e9b54de4
...
@@ -3059,22 +3059,20 @@ int wm8994_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack,
...
@@ -3059,22 +3059,20 @@ int wm8994_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack,
}
}
EXPORT_SYMBOL_GPL
(
wm8994_mic_detect
);
EXPORT_SYMBOL_GPL
(
wm8994_mic_detect
);
static
irqreturn_t
wm8994_mic_irq
(
int
irq
,
void
*
data
)
static
void
wm8994_mic_work
(
struct
work_struct
*
work
)
{
{
struct
wm8994_priv
*
priv
=
data
;
struct
wm8994_priv
*
priv
=
container_of
(
work
,
struct
wm8994_priv
,
mic_work
.
work
);
struct
snd_soc_codec
*
codec
=
priv
->
codec
;
struct
snd_soc_codec
*
codec
=
priv
->
codec
;
int
reg
;
int
reg
;
int
report
;
int
report
;
#ifndef CONFIG_SND_SOC_WM8994_MODULE
trace_snd_soc_jack_irq
(
dev_name
(
codec
->
dev
));
#endif
reg
=
snd_soc_read
(
codec
,
WM8994_INTERRUPT_RAW_STATUS_2
);
reg
=
snd_soc_read
(
codec
,
WM8994_INTERRUPT_RAW_STATUS_2
);
if
(
reg
<
0
)
{
if
(
reg
<
0
)
{
dev_err
(
codec
->
dev
,
"Failed to read microphone status: %d
\n
"
,
dev_err
(
codec
->
dev
,
"Failed to read microphone status: %d
\n
"
,
reg
);
reg
);
return
IRQ_HANDLED
;
return
;
}
}
dev_dbg
(
codec
->
dev
,
"Microphone status: %x
\n
"
,
reg
);
dev_dbg
(
codec
->
dev
,
"Microphone status: %x
\n
"
,
reg
);
...
@@ -3116,6 +3114,20 @@ static irqreturn_t wm8994_mic_irq(int irq, void *data)
...
@@ -3116,6 +3114,20 @@ static irqreturn_t wm8994_mic_irq(int irq, void *data)
snd_soc_jack_report
(
priv
->
micdet
[
1
].
jack
,
report
,
snd_soc_jack_report
(
priv
->
micdet
[
1
].
jack
,
report
,
SND_JACK_HEADSET
|
SND_JACK_BTN_0
);
SND_JACK_HEADSET
|
SND_JACK_BTN_0
);
}
static
irqreturn_t
wm8994_mic_irq
(
int
irq
,
void
*
data
)
{
struct
wm8994_priv
*
priv
=
data
;
struct
snd_soc_codec
*
codec
=
priv
->
codec
;
#ifndef CONFIG_SND_SOC_WM8994_MODULE
trace_snd_soc_jack_irq
(
dev_name
(
codec
->
dev
));
#endif
pm_wakeup_event
(
codec
->
dev
,
300
);
schedule_delayed_work
(
&
priv
->
mic_work
,
msecs_to_jiffies
(
250
));
return
IRQ_HANDLED
;
return
IRQ_HANDLED
;
}
}
...
@@ -3488,6 +3500,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
...
@@ -3488,6 +3500,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
wm8994
->
codec
=
codec
;
wm8994
->
codec
=
codec
;
mutex_init
(
&
wm8994
->
accdet_lock
);
mutex_init
(
&
wm8994
->
accdet_lock
);
INIT_DELAYED_WORK
(
&
wm8994
->
mic_work
,
wm8994_mic_work
);
for
(
i
=
0
;
i
<
ARRAY_SIZE
(
wm8994
->
fll_locked
);
i
++
)
for
(
i
=
0
;
i
<
ARRAY_SIZE
(
wm8994
->
fll_locked
);
i
++
)
init_completion
(
&
wm8994
->
fll_locked
[
i
]);
init_completion
(
&
wm8994
->
fll_locked
[
i
]);
...
...
sound/soc/codecs/wm8994.h
View file @
e9b54de4
...
@@ -12,6 +12,7 @@
...
@@ -12,6 +12,7 @@
#include <sound/soc.h>
#include <sound/soc.h>
#include <linux/firmware.h>
#include <linux/firmware.h>
#include <linux/completion.h>
#include <linux/completion.h>
#include <linux/workqueue.h>
#include "wm_hubs.h"
#include "wm_hubs.h"
...
@@ -127,6 +128,7 @@ struct wm8994_priv {
...
@@ -127,6 +128,7 @@ struct wm8994_priv {
struct
mutex
accdet_lock
;
struct
mutex
accdet_lock
;
struct
wm8994_micdet
micdet
[
2
];
struct
wm8994_micdet
micdet
[
2
];
struct
delayed_work
mic_work
;
bool
mic_detecting
;
bool
mic_detecting
;
bool
jack_mic
;
bool
jack_mic
;
int
btn_mask
;
int
btn_mask
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment