Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Linux-御风守护者
linux
提交
dcc3c4c0
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,发现更多精彩内容 >>
提交
dcc3c4c0
编写于
1月 28, 2011
作者:
T
Takashi Iwai
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'fix/asoc' into for-linus
上级
ded9f523
a3adfa00
变更
14
显示空白变更内容
内联
并排
Showing
14 changed file
with
28 addition
and
29 deletion
+28
-29
sound/soc/atmel/snd-soc-afeb9260.c
sound/soc/atmel/snd-soc-afeb9260.c
+1
-1
sound/soc/blackfin/bf5xx-ssm2602.c
sound/soc/blackfin/bf5xx-ssm2602.c
+1
-1
sound/soc/codecs/wm8994.c
sound/soc/codecs/wm8994.c
+1
-1
sound/soc/codecs/wm8995.c
sound/soc/codecs/wm8995.c
+1
-1
sound/soc/codecs/wm_hubs.c
sound/soc/codecs/wm_hubs.c
+7
-8
sound/soc/davinci/davinci-evm.c
sound/soc/davinci/davinci-evm.c
+1
-1
sound/soc/pxa/corgi.c
sound/soc/pxa/corgi.c
+2
-2
sound/soc/pxa/poodle.c
sound/soc/pxa/poodle.c
+1
-1
sound/soc/pxa/spitz.c
sound/soc/pxa/spitz.c
+2
-2
sound/soc/samsung/neo1973_gta02_wm8753.c
sound/soc/samsung/neo1973_gta02_wm8753.c
+3
-3
sound/soc/samsung/neo1973_wm8753.c
sound/soc/samsung/neo1973_wm8753.c
+3
-3
sound/soc/samsung/s3c24xx_simtec_hermes.c
sound/soc/samsung/s3c24xx_simtec_hermes.c
+2
-2
sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c
sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c
+2
-2
sound/soc/samsung/s3c24xx_uda134x.c
sound/soc/samsung/s3c24xx_uda134x.c
+1
-1
未找到文件。
sound/soc/atmel/snd-soc-afeb9260.c
浏览文件 @
dcc3c4c0
...
@@ -129,7 +129,7 @@ static struct snd_soc_dai_link afeb9260_dai = {
...
@@ -129,7 +129,7 @@ static struct snd_soc_dai_link afeb9260_dai = {
.
cpu_dai_name
=
"atmel-ssc-dai.0"
,
.
cpu_dai_name
=
"atmel-ssc-dai.0"
,
.
codec_dai_name
=
"tlv320aic23-hifi"
,
.
codec_dai_name
=
"tlv320aic23-hifi"
,
.
platform_name
=
"atmel_pcm-audio"
,
.
platform_name
=
"atmel_pcm-audio"
,
.
codec_name
=
"tlv320aic23-codec.0-0
x
1a"
,
.
codec_name
=
"tlv320aic23-codec.0-0
0
1a"
,
.
init
=
afeb9260_tlv320aic23_init
,
.
init
=
afeb9260_tlv320aic23_init
,
.
ops
=
&
afeb9260_ops
,
.
ops
=
&
afeb9260_ops
,
};
};
...
...
sound/soc/blackfin/bf5xx-ssm2602.c
浏览文件 @
dcc3c4c0
...
@@ -119,7 +119,7 @@ static struct snd_soc_dai_link bf5xx_ssm2602_dai = {
...
@@ -119,7 +119,7 @@ static struct snd_soc_dai_link bf5xx_ssm2602_dai = {
.
cpu_dai_name
=
"bf5xx-i2s"
,
.
cpu_dai_name
=
"bf5xx-i2s"
,
.
codec_dai_name
=
"ssm2602-hifi"
,
.
codec_dai_name
=
"ssm2602-hifi"
,
.
platform_name
=
"bf5xx-pcm-audio"
,
.
platform_name
=
"bf5xx-pcm-audio"
,
.
codec_name
=
"ssm2602-codec.0-0
x
1b"
,
.
codec_name
=
"ssm2602-codec.0-0
0
1b"
,
.
ops
=
&
bf5xx_ssm2602_ops
,
.
ops
=
&
bf5xx_ssm2602_ops
,
};
};
...
...
sound/soc/codecs/wm8994.c
浏览文件 @
dcc3c4c0
...
@@ -2386,7 +2386,7 @@ static int wm8994_set_tristate(struct snd_soc_dai *codec_dai, int tristate)
...
@@ -2386,7 +2386,7 @@ static int wm8994_set_tristate(struct snd_soc_dai *codec_dai, int tristate)
else
else
val
=
0
;
val
=
0
;
return
snd_soc_update_bits
(
codec
,
reg
,
mask
,
reg
);
return
snd_soc_update_bits
(
codec
,
reg
,
mask
,
val
);
}
}
#define WM8994_RATES SNDRV_PCM_RATE_8000_96000
#define WM8994_RATES SNDRV_PCM_RATE_8000_96000
...
...
sound/soc/codecs/wm8995.c
浏览文件 @
dcc3c4c0
...
@@ -1223,7 +1223,7 @@ static int wm8995_set_tristate(struct snd_soc_dai *codec_dai, int tristate)
...
@@ -1223,7 +1223,7 @@ static int wm8995_set_tristate(struct snd_soc_dai *codec_dai, int tristate)
else
else
val
=
0
;
val
=
0
;
return
snd_soc_update_bits
(
codec
,
reg
,
mask
,
reg
);
return
snd_soc_update_bits
(
codec
,
reg
,
mask
,
val
);
}
}
/* The size in bits of the FLL divide multiplied by 10
/* The size in bits of the FLL divide multiplied by 10
...
...
sound/soc/codecs/wm_hubs.c
浏览文件 @
dcc3c4c0
...
@@ -91,6 +91,7 @@ static void wait_for_dc_servo(struct snd_soc_codec *codec, unsigned int op)
...
@@ -91,6 +91,7 @@ static void wait_for_dc_servo(struct snd_soc_codec *codec, unsigned int op)
static
void
calibrate_dc_servo
(
struct
snd_soc_codec
*
codec
)
static
void
calibrate_dc_servo
(
struct
snd_soc_codec
*
codec
)
{
{
struct
wm_hubs_data
*
hubs
=
snd_soc_codec_get_drvdata
(
codec
);
struct
wm_hubs_data
*
hubs
=
snd_soc_codec_get_drvdata
(
codec
);
s8
offset
;
u16
reg
,
reg_l
,
reg_r
,
dcs_cfg
;
u16
reg
,
reg_l
,
reg_r
,
dcs_cfg
;
/* If we're using a digital only path and have a previously
/* If we're using a digital only path and have a previously
...
@@ -149,16 +150,14 @@ static void calibrate_dc_servo(struct snd_soc_codec *codec)
...
@@ -149,16 +150,14 @@ static void calibrate_dc_servo(struct snd_soc_codec *codec)
hubs
->
dcs_codes
);
hubs
->
dcs_codes
);
/* HPOUT1L */
/* HPOUT1L */
if
(
reg_l
+
hubs
->
dcs_codes
>
0
&&
offset
=
reg_l
;
reg_l
+
hubs
->
dcs_codes
<
0xff
)
offset
+=
hubs
->
dcs_codes
;
reg_l
+=
hubs
->
dcs_codes
;
dcs_cfg
=
(
u8
)
offset
<<
WM8993_DCS_DAC_WR_VAL_1_SHIFT
;
dcs_cfg
=
reg_l
<<
WM8993_DCS_DAC_WR_VAL_1_SHIFT
;
/* HPOUT1R */
/* HPOUT1R */
if
(
reg_r
+
hubs
->
dcs_codes
>
0
&&
offset
=
reg_r
;
reg_r
+
hubs
->
dcs_codes
<
0xff
)
offset
+=
hubs
->
dcs_codes
;
reg_r
+=
hubs
->
dcs_codes
;
dcs_cfg
|=
(
u8
)
offset
;
dcs_cfg
|=
reg_r
;
dev_dbg
(
codec
->
dev
,
"DCS result: %x
\n
"
,
dcs_cfg
);
dev_dbg
(
codec
->
dev
,
"DCS result: %x
\n
"
,
dcs_cfg
);
...
...
sound/soc/davinci/davinci-evm.c
浏览文件 @
dcc3c4c0
...
@@ -223,7 +223,7 @@ static struct snd_soc_dai_link da8xx_evm_dai = {
...
@@ -223,7 +223,7 @@ static struct snd_soc_dai_link da8xx_evm_dai = {
.
stream_name
=
"AIC3X"
,
.
stream_name
=
"AIC3X"
,
.
cpu_dai_name
=
"davinci-mcasp.0"
,
.
cpu_dai_name
=
"davinci-mcasp.0"
,
.
codec_dai_name
=
"tlv320aic3x-hifi"
,
.
codec_dai_name
=
"tlv320aic3x-hifi"
,
.
codec_name
=
"tlv320aic3x-codec.
0-001a
"
,
.
codec_name
=
"tlv320aic3x-codec.
1-0018
"
,
.
platform_name
=
"davinci-pcm-audio"
,
.
platform_name
=
"davinci-pcm-audio"
,
.
init
=
evm_aic3x_init
,
.
init
=
evm_aic3x_init
,
.
ops
=
&
evm_ops
,
.
ops
=
&
evm_ops
,
...
...
sound/soc/pxa/corgi.c
浏览文件 @
dcc3c4c0
...
@@ -307,10 +307,10 @@ static int corgi_wm8731_init(struct snd_soc_pcm_runtime *rtd)
...
@@ -307,10 +307,10 @@ static int corgi_wm8731_init(struct snd_soc_pcm_runtime *rtd)
static
struct
snd_soc_dai_link
corgi_dai
=
{
static
struct
snd_soc_dai_link
corgi_dai
=
{
.
name
=
"WM8731"
,
.
name
=
"WM8731"
,
.
stream_name
=
"WM8731"
,
.
stream_name
=
"WM8731"
,
.
cpu_dai_name
=
"pxa
-is2-dai
"
,
.
cpu_dai_name
=
"pxa
2xx-i2s
"
,
.
codec_dai_name
=
"wm8731-hifi"
,
.
codec_dai_name
=
"wm8731-hifi"
,
.
platform_name
=
"pxa-pcm-audio"
,
.
platform_name
=
"pxa-pcm-audio"
,
.
codec_name
=
"wm8731-codec-0.001
a
"
,
.
codec_name
=
"wm8731-codec-0.001
b
"
,
.
init
=
corgi_wm8731_init
,
.
init
=
corgi_wm8731_init
,
.
ops
=
&
corgi_ops
,
.
ops
=
&
corgi_ops
,
};
};
...
...
sound/soc/pxa/poodle.c
浏览文件 @
dcc3c4c0
...
@@ -276,7 +276,7 @@ static struct snd_soc_dai_link poodle_dai = {
...
@@ -276,7 +276,7 @@ static struct snd_soc_dai_link poodle_dai = {
.
cpu_dai_name
=
"pxa2xx-i2s"
,
.
cpu_dai_name
=
"pxa2xx-i2s"
,
.
codec_dai_name
=
"wm8731-hifi"
,
.
codec_dai_name
=
"wm8731-hifi"
,
.
platform_name
=
"pxa-pcm-audio"
,
.
platform_name
=
"pxa-pcm-audio"
,
.
codec_name
=
"wm8731-codec.0-001
a
"
,
.
codec_name
=
"wm8731-codec.0-001
b
"
,
.
init
=
poodle_wm8731_init
,
.
init
=
poodle_wm8731_init
,
.
ops
=
&
poodle_ops
,
.
ops
=
&
poodle_ops
,
};
};
...
...
sound/soc/pxa/spitz.c
浏览文件 @
dcc3c4c0
...
@@ -315,10 +315,10 @@ static int spitz_wm8750_init(struct snd_soc_pcm_runtime *rtd)
...
@@ -315,10 +315,10 @@ static int spitz_wm8750_init(struct snd_soc_pcm_runtime *rtd)
static
struct
snd_soc_dai_link
spitz_dai
=
{
static
struct
snd_soc_dai_link
spitz_dai
=
{
.
name
=
"wm8750"
,
.
name
=
"wm8750"
,
.
stream_name
=
"WM8750"
,
.
stream_name
=
"WM8750"
,
.
cpu_dai_name
=
"pxa
-is2
"
,
.
cpu_dai_name
=
"pxa
2xx-i2s
"
,
.
codec_dai_name
=
"wm8750-hifi"
,
.
codec_dai_name
=
"wm8750-hifi"
,
.
platform_name
=
"pxa-pcm-audio"
,
.
platform_name
=
"pxa-pcm-audio"
,
.
codec_name
=
"wm8750-codec.0-001
a
"
,
.
codec_name
=
"wm8750-codec.0-001
b
"
,
.
init
=
spitz_wm8750_init
,
.
init
=
spitz_wm8750_init
,
.
ops
=
&
spitz_ops
,
.
ops
=
&
spitz_ops
,
};
};
...
...
sound/soc/samsung/neo1973_gta02_wm8753.c
浏览文件 @
dcc3c4c0
...
@@ -397,11 +397,11 @@ static struct snd_soc_dai_link neo1973_gta02_dai[] = {
...
@@ -397,11 +397,11 @@ static struct snd_soc_dai_link neo1973_gta02_dai[] = {
{
/* Hifi Playback - for similatious use with voice below */
{
/* Hifi Playback - for similatious use with voice below */
.
name
=
"WM8753"
,
.
name
=
"WM8753"
,
.
stream_name
=
"WM8753 HiFi"
,
.
stream_name
=
"WM8753 HiFi"
,
.
cpu_dai_name
=
"s3c24xx-i
2
s"
,
.
cpu_dai_name
=
"s3c24xx-i
i
s"
,
.
codec_dai_name
=
"wm8753-hifi"
,
.
codec_dai_name
=
"wm8753-hifi"
,
.
init
=
neo1973_gta02_wm8753_init
,
.
init
=
neo1973_gta02_wm8753_init
,
.
platform_name
=
"samsung-audio"
,
.
platform_name
=
"samsung-audio"
,
.
codec_name
=
"wm8753-codec.0-0
x
1a"
,
.
codec_name
=
"wm8753-codec.0-0
0
1a"
,
.
ops
=
&
neo1973_gta02_hifi_ops
,
.
ops
=
&
neo1973_gta02_hifi_ops
,
},
},
{
/* Voice via BT */
{
/* Voice via BT */
...
@@ -410,7 +410,7 @@ static struct snd_soc_dai_link neo1973_gta02_dai[] = {
...
@@ -410,7 +410,7 @@ static struct snd_soc_dai_link neo1973_gta02_dai[] = {
.
cpu_dai_name
=
"bluetooth-dai"
,
.
cpu_dai_name
=
"bluetooth-dai"
,
.
codec_dai_name
=
"wm8753-voice"
,
.
codec_dai_name
=
"wm8753-voice"
,
.
ops
=
&
neo1973_gta02_voice_ops
,
.
ops
=
&
neo1973_gta02_voice_ops
,
.
codec_name
=
"wm8753-codec.0-0
x
1a"
,
.
codec_name
=
"wm8753-codec.0-0
0
1a"
,
.
platform_name
=
"samsung-audio"
,
.
platform_name
=
"samsung-audio"
,
},
},
};
};
...
...
sound/soc/samsung/neo1973_wm8753.c
浏览文件 @
dcc3c4c0
...
@@ -559,9 +559,9 @@ static struct snd_soc_dai_link neo1973_dai[] = {
...
@@ -559,9 +559,9 @@ static struct snd_soc_dai_link neo1973_dai[] = {
.
name
=
"WM8753"
,
.
name
=
"WM8753"
,
.
stream_name
=
"WM8753 HiFi"
,
.
stream_name
=
"WM8753 HiFi"
,
.
platform_name
=
"samsung-audio"
,
.
platform_name
=
"samsung-audio"
,
.
cpu_dai_name
=
"s3c24xx-i
2
s"
,
.
cpu_dai_name
=
"s3c24xx-i
i
s"
,
.
codec_dai_name
=
"wm8753-hifi"
,
.
codec_dai_name
=
"wm8753-hifi"
,
.
codec_name
=
"wm8753-codec.0-0
x
1a"
,
.
codec_name
=
"wm8753-codec.0-0
0
1a"
,
.
init
=
neo1973_wm8753_init
,
.
init
=
neo1973_wm8753_init
,
.
ops
=
&
neo1973_hifi_ops
,
.
ops
=
&
neo1973_hifi_ops
,
},
},
...
@@ -571,7 +571,7 @@ static struct snd_soc_dai_link neo1973_dai[] = {
...
@@ -571,7 +571,7 @@ static struct snd_soc_dai_link neo1973_dai[] = {
.
platform_name
=
"samsung-audio"
,
.
platform_name
=
"samsung-audio"
,
.
cpu_dai_name
=
"bluetooth-dai"
,
.
cpu_dai_name
=
"bluetooth-dai"
,
.
codec_dai_name
=
"wm8753-voice"
,
.
codec_dai_name
=
"wm8753-voice"
,
.
codec_name
=
"wm8753-codec.0-0
x
1a"
,
.
codec_name
=
"wm8753-codec.0-0
0
1a"
,
.
ops
=
&
neo1973_voice_ops
,
.
ops
=
&
neo1973_voice_ops
,
},
},
};
};
...
...
sound/soc/samsung/s3c24xx_simtec_hermes.c
浏览文件 @
dcc3c4c0
...
@@ -94,8 +94,8 @@ static int simtec_hermes_init(struct snd_soc_pcm_runtime *rtd)
...
@@ -94,8 +94,8 @@ static int simtec_hermes_init(struct snd_soc_pcm_runtime *rtd)
static
struct
snd_soc_dai_link
simtec_dai_aic33
=
{
static
struct
snd_soc_dai_link
simtec_dai_aic33
=
{
.
name
=
"tlv320aic33"
,
.
name
=
"tlv320aic33"
,
.
stream_name
=
"TLV320AIC33"
,
.
stream_name
=
"TLV320AIC33"
,
.
codec_name
=
"tlv320aic3x-codec.0-0
x
1a"
,
.
codec_name
=
"tlv320aic3x-codec.0-0
0
1a"
,
.
cpu_dai_name
=
"s3c24xx-i
2
s"
,
.
cpu_dai_name
=
"s3c24xx-i
i
s"
,
.
codec_dai_name
=
"tlv320aic3x-hifi"
,
.
codec_dai_name
=
"tlv320aic3x-hifi"
,
.
platform_name
=
"samsung-audio"
,
.
platform_name
=
"samsung-audio"
,
.
init
=
simtec_hermes_init
,
.
init
=
simtec_hermes_init
,
...
...
sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c
浏览文件 @
dcc3c4c0
...
@@ -85,8 +85,8 @@ static int simtec_tlv320aic23_init(struct snd_soc_pcm_runtime *rtd)
...
@@ -85,8 +85,8 @@ static int simtec_tlv320aic23_init(struct snd_soc_pcm_runtime *rtd)
static
struct
snd_soc_dai_link
simtec_dai_aic23
=
{
static
struct
snd_soc_dai_link
simtec_dai_aic23
=
{
.
name
=
"tlv320aic23"
,
.
name
=
"tlv320aic23"
,
.
stream_name
=
"TLV320AIC23"
,
.
stream_name
=
"TLV320AIC23"
,
.
codec_name
=
"tlv320aic3x-codec.0-0
x
1a"
,
.
codec_name
=
"tlv320aic3x-codec.0-0
0
1a"
,
.
cpu_dai_name
=
"s3c24xx-i
2
s"
,
.
cpu_dai_name
=
"s3c24xx-i
i
s"
,
.
codec_dai_name
=
"tlv320aic3x-hifi"
,
.
codec_dai_name
=
"tlv320aic3x-hifi"
,
.
platform_name
=
"samsung-audio"
,
.
platform_name
=
"samsung-audio"
,
.
init
=
simtec_tlv320aic23_init
,
.
init
=
simtec_tlv320aic23_init
,
...
...
sound/soc/samsung/s3c24xx_uda134x.c
浏览文件 @
dcc3c4c0
...
@@ -228,7 +228,7 @@ static struct snd_soc_dai_link s3c24xx_uda134x_dai_link = {
...
@@ -228,7 +228,7 @@ static struct snd_soc_dai_link s3c24xx_uda134x_dai_link = {
.
stream_name
=
"UDA134X"
,
.
stream_name
=
"UDA134X"
,
.
codec_name
=
"uda134x-hifi"
,
.
codec_name
=
"uda134x-hifi"
,
.
codec_dai_name
=
"uda134x-hifi"
,
.
codec_dai_name
=
"uda134x-hifi"
,
.
cpu_dai_name
=
"s3c24xx-i
2
s"
,
.
cpu_dai_name
=
"s3c24xx-i
i
s"
,
.
ops
=
&
s3c24xx_uda134x_ops
,
.
ops
=
&
s3c24xx_uda134x_ops
,
.
platform_name
=
"samsung-audio"
,
.
platform_name
=
"samsung-audio"
,
};
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录