Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Linux-御风守护者
linux
提交
1dd6c077
L
linux
项目概览
Linux-御风守护者
/
linux
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1dd6c077
编写于
11月 08, 2011
作者:
M
Mark Brown
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'for-3.2' of
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound
into for-3.2
上级
1ea6b8f4
19940b3d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
45 addition
and
15 deletion
+45
-15
MAINTAINERS
MAINTAINERS
+1
-1
include/linux/mfd/wm8994/registers.h
include/linux/mfd/wm8994/registers.h
+15
-0
sound/soc/codecs/wm8994.c
sound/soc/codecs/wm8994.c
+29
-14
未找到文件。
MAINTAINERS
浏览文件 @
1dd6c077
...
...
@@ -6122,7 +6122,7 @@ F: sound/
SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
M: Liam Girdwood <lrg@ti.com>
M: Mark Brown <broonie@opensource.wolfsonmicro.com>
T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound
-2.6
.git
T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
L: alsa-devel@alsa-project.org (moderated for non-subscribers)
W: http://alsa-project.org/main/index.php/ASoC
S: Supported
...
...
include/linux/mfd/wm8994/registers.h
浏览文件 @
1dd6c077
...
...
@@ -1962,6 +1962,21 @@
#define WM8958_MICB2_DISCH_SHIFT 0
/* MICB2_DISCH */
#define WM8958_MICB2_DISCH_WIDTH 1
/* MICB2_DISCH */
/*
* R210 (0xD2) - Mic Detect 3
*/
#define WM8958_MICD_LVL_MASK 0x07FC
/* MICD_LVL - [10:2] */
#define WM8958_MICD_LVL_SHIFT 2
/* MICD_LVL - [10:2] */
#define WM8958_MICD_LVL_WIDTH 9
/* MICD_LVL - [10:2] */
#define WM8958_MICD_VALID 0x0002
/* MICD_VALID */
#define WM8958_MICD_VALID_MASK 0x0002
/* MICD_VALID */
#define WM8958_MICD_VALID_SHIFT 1
/* MICD_VALID */
#define WM8958_MICD_VALID_WIDTH 1
/* MICD_VALID */
#define WM8958_MICD_STS 0x0001
/* MICD_STS */
#define WM8958_MICD_STS_MASK 0x0001
/* MICD_STS */
#define WM8958_MICD_STS_SHIFT 0
/* MICD_STS */
#define WM8958_MICD_STS_WIDTH 1
/* MICD_STS */
/*
* R76 (0x4C) - Charge Pump (1)
*/
...
...
sound/soc/codecs/wm8994.c
浏览文件 @
1dd6c077
...
...
@@ -56,7 +56,7 @@ static int wm8994_retune_mobile_base[] = {
static
int
wm8994_readable
(
struct
snd_soc_codec
*
codec
,
unsigned
int
reg
)
{
struct
wm8994_priv
*
wm8994
=
snd_soc_codec_get_drvdata
(
codec
);
struct
wm8994
*
control
=
wm8994
->
control_data
;
struct
wm8994
*
control
=
codec
->
control_data
;
switch
(
reg
)
{
case
WM8994_GPIO_1
:
...
...
@@ -3030,19 +3030,34 @@ static irqreturn_t wm8958_mic_irq(int irq, void *data)
{
struct
wm8994_priv
*
wm8994
=
data
;
struct
snd_soc_codec
*
codec
=
wm8994
->
codec
;
int
reg
;
int
reg
,
count
;
reg
=
snd_soc_read
(
codec
,
WM8958_MIC_DETECT_3
);
if
(
reg
<
0
)
{
dev_err
(
codec
->
dev
,
"Failed to read mic detect status: %d
\n
"
,
reg
);
return
IRQ_NONE
;
}
/* We may occasionally read a detection without an impedence
* range being provided - if that happens loop again.
*/
count
=
10
;
do
{
reg
=
snd_soc_read
(
codec
,
WM8958_MIC_DETECT_3
);
if
(
reg
<
0
)
{
dev_err
(
codec
->
dev
,
"Failed to read mic detect status: %d
\n
"
,
reg
);
return
IRQ_NONE
;
}
if
(
!
(
reg
&
WM8958_MICD_VALID
))
{
dev_dbg
(
codec
->
dev
,
"Mic detect data not valid
\n
"
);
goto
out
;
}
if
(
!
(
reg
&
WM8958_MICD_VALID
))
{
dev_dbg
(
codec
->
dev
,
"Mic detect data not valid
\n
"
);
goto
out
;
}
if
(
!
(
reg
&
WM8958_MICD_STS
)
||
(
reg
&
WM8958_MICD_LVL_MASK
))
break
;
msleep
(
1
);
}
while
(
count
--
);
if
(
count
==
0
)
dev_warn
(
codec
->
dev
,
"No impedence range reported for jack
\n
"
);
#ifndef CONFIG_SND_SOC_WM8994_MODULE
trace_snd_soc_jack_irq
(
dev_name
(
codec
->
dev
));
...
...
@@ -3180,9 +3195,9 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
wm8994_request_irq
(
codec
->
control_data
,
WM8994_IRQ_FIFOS_ERR
,
wm8994_fifo_error
,
"FIFO error"
,
codec
);
wm8994_request_irq
(
wm8994
->
control_data
,
WM8994_IRQ_TEMP_WARN
,
wm8994_request_irq
(
codec
->
control_data
,
WM8994_IRQ_TEMP_WARN
,
wm8994_temp_warn
,
"Thermal warning"
,
codec
);
wm8994_request_irq
(
wm8994
->
control_data
,
WM8994_IRQ_TEMP_SHUT
,
wm8994_request_irq
(
codec
->
control_data
,
WM8994_IRQ_TEMP_SHUT
,
wm8994_temp_shut
,
"Thermal shutdown"
,
codec
);
ret
=
wm8994_request_irq
(
codec
->
control_data
,
WM8994_IRQ_DCS_DONE
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录