Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
d70ab7f7
cloud-kernel
项目概览
openanolis
/
cloud-kernel
大约 1 年 前同步成功
通知
153
Star
36
Fork
7
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
10
列表
看板
标记
里程碑
合并请求
2
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
10
Issue
10
列表
看板
标记
里程碑
合并请求
2
合并请求
2
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d70ab7f7
编写于
12月 09, 2010
作者:
T
Takashi Iwai
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'fix/asoc' into for-linus
上级
58936b29
2a7b1a00
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
16 addition
and
12 deletion
+16
-12
include/linux/mfd/wm8994/pdata.h
include/linux/mfd/wm8994/pdata.h
+1
-1
sound/soc/codecs/wm8580.c
sound/soc/codecs/wm8580.c
+4
-4
sound/soc/codecs/wm8962.c
sound/soc/codecs/wm8962.c
+1
-1
sound/soc/codecs/wm_hubs.c
sound/soc/codecs/wm_hubs.c
+1
-1
sound/soc/soc-core.c
sound/soc/soc-core.c
+9
-5
未找到文件。
include/linux/mfd/wm8994/pdata.h
浏览文件 @
d70ab7f7
...
...
@@ -29,7 +29,7 @@ struct wm8994_ldo_pdata {
#define WM8994_CONFIGURE_GPIO 0x8000
#define WM8994_DRC_REGS 5
#define WM8994_EQ_REGS
19
#define WM8994_EQ_REGS
20
/**
* DRC configurations are specified with a label and a set of register
...
...
sound/soc/codecs/wm8580.c
浏览文件 @
d70ab7f7
...
...
@@ -491,16 +491,16 @@ static int wm8580_paif_hw_params(struct snd_pcm_substream *substream,
paifa
|=
0x8
;
break
;
case
SNDRV_PCM_FORMAT_S20_3LE
:
paifa
|=
0x
1
0
;
paifa
|=
0x0
;
paifb
|=
WM8580_AIF_LENGTH_20
;
break
;
case
SNDRV_PCM_FORMAT_S24_LE
:
paifa
|=
0x
1
0
;
paifa
|=
0x0
;
paifb
|=
WM8580_AIF_LENGTH_24
;
break
;
case
SNDRV_PCM_FORMAT_S32_LE
:
paifa
|=
0x
1
0
;
paifb
|=
WM8580_AIF_LENGTH_
24
;
paifa
|=
0x0
;
paifb
|=
WM8580_AIF_LENGTH_
32
;
break
;
default:
return
-
EINVAL
;
...
...
sound/soc/codecs/wm8962.c
浏览文件 @
d70ab7f7
...
...
@@ -3339,7 +3339,7 @@ static irqreturn_t wm8962_irq(int irq, void *data)
int
mask
;
int
active
;
mask
=
snd_soc_read
(
codec
,
WM8962_INTERRUPT_STATUS_2
);
mask
=
snd_soc_read
(
codec
,
WM8962_INTERRUPT_STATUS_2
_MASK
);
active
=
snd_soc_read
(
codec
,
WM8962_INTERRUPT_STATUS_2
);
active
&=
~
mask
;
...
...
sound/soc/codecs/wm_hubs.c
浏览文件 @
d70ab7f7
...
...
@@ -293,7 +293,7 @@ SOC_DOUBLE_R("Speaker Switch",
SOC_DOUBLE_R
(
"Speaker ZC Switch"
,
WM8993_SPEAKER_VOLUME_LEFT
,
WM8993_SPEAKER_VOLUME_RIGHT
,
7
,
1
,
0
),
SOC_DOUBLE_TLV
(
"Speaker Boost Volume"
,
WM8993_SPKOUT_BOOST
,
0
,
3
,
7
,
0
,
SOC_DOUBLE_TLV
(
"Speaker Boost Volume"
,
WM8993_SPKOUT_BOOST
,
3
,
0
,
7
,
0
,
spkboost_tlv
),
SOC_ENUM
(
"Speaker Reference"
,
speaker_ref
),
SOC_ENUM
(
"Speaker Mode"
,
speaker_mode
),
...
...
sound/soc/soc-core.c
浏览文件 @
d70ab7f7
...
...
@@ -1619,12 +1619,14 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)
#ifdef CONFIG_SND_SOC_AC97_BUS
/* register any AC97 codecs */
for
(
i
=
0
;
i
<
card
->
num_rtd
;
i
++
)
{
ret
=
soc_register_ac97_dai_link
(
&
card
->
rtd
[
i
]);
if
(
ret
<
0
)
{
printk
(
KERN_ERR
"asoc: failed to register AC97 %s
\n
"
,
card
->
name
);
goto
probe_dai_err
;
}
ret
=
soc_register_ac97_dai_link
(
&
card
->
rtd
[
i
]);
if
(
ret
<
0
)
{
printk
(
KERN_ERR
"asoc: failed to register AC97 %s
\n
"
,
card
->
name
);
while
(
--
i
>=
0
)
soc_unregister_ac97_dai_link
(
&
card
->
rtd
[
i
]);
goto
probe_dai_err
;
}
}
#endif
card
->
instantiated
=
1
;
...
...
@@ -3072,7 +3074,9 @@ int snd_soc_register_dais(struct device *dev,
pr_debug
(
"Registered DAI '%s'
\n
"
,
dai
->
name
);
}
mutex_lock
(
&
client_mutex
);
snd_soc_instantiate_cards
();
mutex_unlock
(
&
client_mutex
);
return
0
;
err:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录