Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
bbb2b682
cloud-kernel
项目概览
openanolis
/
cloud-kernel
1 年多 前同步成功
通知
160
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看板
提交
bbb2b682
编写于
5月 10, 2009
作者:
T
Takashi Iwai
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'fix/asoc' into for-linus
* fix/asoc: ASoC: Fix errors in WM8990
上级
b40814b8
97a775c4
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
20 addition
and
20 deletion
+20
-20
sound/soc/codecs/wm8990.c
sound/soc/codecs/wm8990.c
+20
-20
未找到文件。
sound/soc/codecs/wm8990.c
浏览文件 @
bbb2b682
...
@@ -729,7 +729,7 @@ SND_SOC_DAPM_MIXER_E("INMIXL", WM8990_INTDRIVBITS, WM8990_INMIXL_PWR_BIT, 0,
...
@@ -729,7 +729,7 @@ SND_SOC_DAPM_MIXER_E("INMIXL", WM8990_INTDRIVBITS, WM8990_INMIXL_PWR_BIT, 0,
inmixer_event
,
SND_SOC_DAPM_POST_PMU
|
SND_SOC_DAPM_POST_PMD
),
inmixer_event
,
SND_SOC_DAPM_POST_PMU
|
SND_SOC_DAPM_POST_PMD
),
/* AINLMUX */
/* AINLMUX */
SND_SOC_DAPM_MUX_E
(
"AI
LN
MUX"
,
WM8990_INTDRIVBITS
,
WM8990_AINLMUX_PWR_BIT
,
0
,
SND_SOC_DAPM_MUX_E
(
"AI
NL
MUX"
,
WM8990_INTDRIVBITS
,
WM8990_AINLMUX_PWR_BIT
,
0
,
&
wm8990_dapm_ainlmux_controls
,
inmixer_event
,
&
wm8990_dapm_ainlmux_controls
,
inmixer_event
,
SND_SOC_DAPM_POST_PMU
|
SND_SOC_DAPM_POST_PMD
),
SND_SOC_DAPM_POST_PMU
|
SND_SOC_DAPM_POST_PMD
),
...
@@ -740,7 +740,7 @@ SND_SOC_DAPM_MIXER_E("INMIXR", WM8990_INTDRIVBITS, WM8990_INMIXR_PWR_BIT, 0,
...
@@ -740,7 +740,7 @@ SND_SOC_DAPM_MIXER_E("INMIXR", WM8990_INTDRIVBITS, WM8990_INMIXR_PWR_BIT, 0,
inmixer_event
,
SND_SOC_DAPM_POST_PMU
|
SND_SOC_DAPM_POST_PMD
),
inmixer_event
,
SND_SOC_DAPM_POST_PMU
|
SND_SOC_DAPM_POST_PMD
),
/* AINRMUX */
/* AINRMUX */
SND_SOC_DAPM_MUX_E
(
"AI
RN
MUX"
,
WM8990_INTDRIVBITS
,
WM8990_AINRMUX_PWR_BIT
,
0
,
SND_SOC_DAPM_MUX_E
(
"AI
NR
MUX"
,
WM8990_INTDRIVBITS
,
WM8990_AINRMUX_PWR_BIT
,
0
,
&
wm8990_dapm_ainrmux_controls
,
inmixer_event
,
&
wm8990_dapm_ainrmux_controls
,
inmixer_event
,
SND_SOC_DAPM_POST_PMU
|
SND_SOC_DAPM_POST_PMD
),
SND_SOC_DAPM_POST_PMU
|
SND_SOC_DAPM_POST_PMD
),
...
@@ -848,40 +848,40 @@ static const struct snd_soc_dapm_route audio_map[] = {
...
@@ -848,40 +848,40 @@ static const struct snd_soc_dapm_route audio_map[] = {
{
"LIN12 PGA"
,
"LIN2 Switch"
,
"LIN2"
},
{
"LIN12 PGA"
,
"LIN2 Switch"
,
"LIN2"
},
/* LIN34 PGA */
/* LIN34 PGA */
{
"LIN34 PGA"
,
"LIN3 Switch"
,
"LIN3"
},
{
"LIN34 PGA"
,
"LIN3 Switch"
,
"LIN3"
},
{
"LIN34 PGA"
,
"LIN4 Switch"
,
"LIN4"
},
{
"LIN34 PGA"
,
"LIN4 Switch"
,
"LIN4
/RXN
"
},
/* INMIXL */
/* INMIXL */
{
"INMIXL"
,
"Record Left Volume"
,
"LOMIX"
},
{
"INMIXL"
,
"Record Left Volume"
,
"LOMIX"
},
{
"INMIXL"
,
"LIN2 Volume"
,
"LIN2"
},
{
"INMIXL"
,
"LIN2 Volume"
,
"LIN2"
},
{
"INMIXL"
,
"LINPGA12 Switch"
,
"LIN12 PGA"
},
{
"INMIXL"
,
"LINPGA12 Switch"
,
"LIN12 PGA"
},
{
"INMIXL"
,
"LINPGA34 Switch"
,
"LIN34 PGA"
},
{
"INMIXL"
,
"LINPGA34 Switch"
,
"LIN34 PGA"
},
/* AI
LN
MUX */
/* AI
NL
MUX */
{
"AI
LN
MUX"
,
"INMIXL Mix"
,
"INMIXL"
},
{
"AI
NL
MUX"
,
"INMIXL Mix"
,
"INMIXL"
},
{
"AI
LNMUX"
,
"DIFFINL Mix"
,
"LIN12
PGA"
},
{
"AI
NLMUX"
,
"DIFFINL Mix"
,
"LIN12
PGA"
},
{
"AI
LNMUX"
,
"DIFFINL Mix"
,
"LIN34
PGA"
},
{
"AI
NLMUX"
,
"DIFFINL Mix"
,
"LIN34
PGA"
},
{
"AI
LN
MUX"
,
"RXVOICE Mix"
,
"LIN4/RXN"
},
{
"AI
NL
MUX"
,
"RXVOICE Mix"
,
"LIN4/RXN"
},
{
"AI
LN
MUX"
,
"RXVOICE Mix"
,
"RIN4/RXP"
},
{
"AI
NL
MUX"
,
"RXVOICE Mix"
,
"RIN4/RXP"
},
/* ADC */
/* ADC */
{
"Left ADC"
,
NULL
,
"AI
LN
MUX"
},
{
"Left ADC"
,
NULL
,
"AI
NL
MUX"
},
/* RIN12 PGA */
/* RIN12 PGA */
{
"RIN12 PGA"
,
"RIN1 Switch"
,
"RIN1"
},
{
"RIN12 PGA"
,
"RIN1 Switch"
,
"RIN1"
},
{
"RIN12 PGA"
,
"RIN2 Switch"
,
"RIN2"
},
{
"RIN12 PGA"
,
"RIN2 Switch"
,
"RIN2"
},
/* RIN34 PGA */
/* RIN34 PGA */
{
"RIN34 PGA"
,
"RIN3 Switch"
,
"RIN3"
},
{
"RIN34 PGA"
,
"RIN3 Switch"
,
"RIN3"
},
{
"RIN34 PGA"
,
"RIN4 Switch"
,
"RIN4"
},
{
"RIN34 PGA"
,
"RIN4 Switch"
,
"RIN4
/RXP
"
},
/* INMIXL */
/* INMIXL */
{
"INMIXR"
,
"Record Right Volume"
,
"ROMIX"
},
{
"INMIXR"
,
"Record Right Volume"
,
"ROMIX"
},
{
"INMIXR"
,
"RIN2 Volume"
,
"RIN2"
},
{
"INMIXR"
,
"RIN2 Volume"
,
"RIN2"
},
{
"INMIXR"
,
"RINPGA12 Switch"
,
"RIN12 PGA"
},
{
"INMIXR"
,
"RINPGA12 Switch"
,
"RIN12 PGA"
},
{
"INMIXR"
,
"RINPGA34 Switch"
,
"RIN34 PGA"
},
{
"INMIXR"
,
"RINPGA34 Switch"
,
"RIN34 PGA"
},
/* AI
RN
MUX */
/* AI
NR
MUX */
{
"AI
RN
MUX"
,
"INMIXR Mix"
,
"INMIXR"
},
{
"AI
NR
MUX"
,
"INMIXR Mix"
,
"INMIXR"
},
{
"AI
RNMUX"
,
"DIFFINR Mix"
,
"RIN12
PGA"
},
{
"AI
NRMUX"
,
"DIFFINR Mix"
,
"RIN12
PGA"
},
{
"AI
RNMUX"
,
"DIFFINR Mix"
,
"RIN34
PGA"
},
{
"AI
NRMUX"
,
"DIFFINR Mix"
,
"RIN34
PGA"
},
{
"AI
RNMUX"
,
"RXVOICE Mix"
,
"R
IN4/RXN"
},
{
"AI
NRMUX"
,
"RXVOICE Mix"
,
"L
IN4/RXN"
},
{
"AI
RN
MUX"
,
"RXVOICE Mix"
,
"RIN4/RXP"
},
{
"AI
NR
MUX"
,
"RXVOICE Mix"
,
"RIN4/RXP"
},
/* ADC */
/* ADC */
{
"Right ADC"
,
NULL
,
"AI
RN
MUX"
},
{
"Right ADC"
,
NULL
,
"AI
NR
MUX"
},
/* LOMIX */
/* LOMIX */
{
"LOMIX"
,
"LOMIX RIN3 Bypass Switch"
,
"RIN3"
},
{
"LOMIX"
,
"LOMIX RIN3 Bypass Switch"
,
"RIN3"
},
...
@@ -922,7 +922,7 @@ static const struct snd_soc_dapm_route audio_map[] = {
...
@@ -922,7 +922,7 @@ static const struct snd_soc_dapm_route audio_map[] = {
{
"LOPMIX"
,
"LOPMIX Left Mixer PGA Switch"
,
"LOPGA"
},
{
"LOPMIX"
,
"LOPMIX Left Mixer PGA Switch"
,
"LOPGA"
},
/* OUT3MIX */
/* OUT3MIX */
{
"OUT3MIX"
,
"OUT3MIX LIN4/RXP Bypass Switch"
,
"LIN4/RX
P
"
},
{
"OUT3MIX"
,
"OUT3MIX LIN4/RXP Bypass Switch"
,
"LIN4/RX
N
"
},
{
"OUT3MIX"
,
"OUT3MIX Left Out PGA Switch"
,
"LOPGA"
},
{
"OUT3MIX"
,
"OUT3MIX Left Out PGA Switch"
,
"LOPGA"
},
/* OUT4MIX */
/* OUT4MIX */
...
@@ -949,7 +949,7 @@ static const struct snd_soc_dapm_route audio_map[] = {
...
@@ -949,7 +949,7 @@ static const struct snd_soc_dapm_route audio_map[] = {
/* Output Pins */
/* Output Pins */
{
"LON"
,
NULL
,
"LONMIX"
},
{
"LON"
,
NULL
,
"LONMIX"
},
{
"LOP"
,
NULL
,
"LOPMIX"
},
{
"LOP"
,
NULL
,
"LOPMIX"
},
{
"OUT"
,
NULL
,
"OUT3MIX"
},
{
"OUT
3
"
,
NULL
,
"OUT3MIX"
},
{
"LOUT"
,
NULL
,
"LOUT PGA"
},
{
"LOUT"
,
NULL
,
"LOUT PGA"
},
{
"SPKN"
,
NULL
,
"SPKMIX"
},
{
"SPKN"
,
NULL
,
"SPKMIX"
},
{
"ROUT"
,
NULL
,
"ROUT PGA"
},
{
"ROUT"
,
NULL
,
"ROUT PGA"
},
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录