Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
bug2833
cloud-kernel
提交
ce24f58a
cloud-kernel
项目概览
bug2833
/
cloud-kernel
与 Fork 源项目一致
Fork自
openanolis / cloud-kernel
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ce24f58a
编写于
3月 23, 2011
作者:
T
Takashi Iwai
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'topic/asoc' into for-linus
上级
5a882646
333802e9
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
25 addition
and
4 deletion
+25
-4
arch/arm/mach-s3c2440/mach-mini2440.c
arch/arm/mach-s3c2440/mach-mini2440.c
+7
-0
sound/soc/codecs/sgtl5000.c
sound/soc/codecs/sgtl5000.c
+14
-0
sound/soc/codecs/uda134x.c
sound/soc/codecs/uda134x.c
+2
-1
sound/soc/samsung/s3c24xx_uda134x.c
sound/soc/samsung/s3c24xx_uda134x.c
+2
-1
sound/soc/soc-core.c
sound/soc/soc-core.c
+0
-2
未找到文件。
arch/arm/mach-s3c2440/mach-mini2440.c
浏览文件 @
ce24f58a
...
@@ -506,6 +506,11 @@ static struct i2c_board_info mini2440_i2c_devs[] __initdata = {
...
@@ -506,6 +506,11 @@ static struct i2c_board_info mini2440_i2c_devs[] __initdata = {
},
},
};
};
static
struct
platform_device
uda1340_codec
=
{
.
name
=
"uda134x-codec"
,
.
id
=
-
1
,
};
static
struct
platform_device
*
mini2440_devices
[]
__initdata
=
{
static
struct
platform_device
*
mini2440_devices
[]
__initdata
=
{
&
s3c_device_ohci
,
&
s3c_device_ohci
,
&
s3c_device_wdt
,
&
s3c_device_wdt
,
...
@@ -521,7 +526,9 @@ static struct platform_device *mini2440_devices[] __initdata = {
...
@@ -521,7 +526,9 @@ static struct platform_device *mini2440_devices[] __initdata = {
&
s3c_device_nand
,
&
s3c_device_nand
,
&
s3c_device_sdi
,
&
s3c_device_sdi
,
&
s3c_device_iis
,
&
s3c_device_iis
,
&
uda1340_codec
,
&
mini2440_audio
,
&
mini2440_audio
,
&
samsung_asoc_dma
,
};
};
static
void
__init
mini2440_map_io
(
void
)
static
void
__init
mini2440_map_io
(
void
)
...
...
sound/soc/codecs/sgtl5000.c
浏览文件 @
ce24f58a
...
@@ -772,6 +772,7 @@ static int sgtl5000_pcm_hw_params(struct snd_pcm_substream *substream,
...
@@ -772,6 +772,7 @@ static int sgtl5000_pcm_hw_params(struct snd_pcm_substream *substream,
return
0
;
return
0
;
}
}
#ifdef CONFIG_REGULATOR
static
int
ldo_regulator_is_enabled
(
struct
regulator_dev
*
dev
)
static
int
ldo_regulator_is_enabled
(
struct
regulator_dev
*
dev
)
{
{
struct
ldo_regulator
*
ldo
=
rdev_get_drvdata
(
dev
);
struct
ldo_regulator
*
ldo
=
rdev_get_drvdata
(
dev
);
...
@@ -901,6 +902,19 @@ static int ldo_regulator_remove(struct snd_soc_codec *codec)
...
@@ -901,6 +902,19 @@ static int ldo_regulator_remove(struct snd_soc_codec *codec)
return
0
;
return
0
;
}
}
#else
static
int
ldo_regulator_register
(
struct
snd_soc_codec
*
codec
,
struct
regulator_init_data
*
init_data
,
int
voltage
)
{
return
-
EINVAL
;
}
static
int
ldo_regulator_remove
(
struct
snd_soc_codec
*
codec
)
{
return
0
;
}
#endif
/*
/*
* set dac bias
* set dac bias
...
...
sound/soc/codecs/uda134x.c
浏览文件 @
ce24f58a
...
@@ -486,7 +486,8 @@ static struct snd_soc_dai_driver uda134x_dai = {
...
@@ -486,7 +486,8 @@ static struct snd_soc_dai_driver uda134x_dai = {
static
int
uda134x_soc_probe
(
struct
snd_soc_codec
*
codec
)
static
int
uda134x_soc_probe
(
struct
snd_soc_codec
*
codec
)
{
{
struct
uda134x_priv
*
uda134x
;
struct
uda134x_priv
*
uda134x
;
struct
uda134x_platform_data
*
pd
=
dev_get_drvdata
(
codec
->
card
->
dev
);
struct
uda134x_platform_data
*
pd
=
codec
->
card
->
dev
->
platform_data
;
int
ret
;
int
ret
;
printk
(
KERN_INFO
"UDA134X SoC Audio Codec
\n
"
);
printk
(
KERN_INFO
"UDA134X SoC Audio Codec
\n
"
);
...
...
sound/soc/samsung/s3c24xx_uda134x.c
浏览文件 @
ce24f58a
...
@@ -219,7 +219,7 @@ static struct snd_soc_ops s3c24xx_uda134x_ops = {
...
@@ -219,7 +219,7 @@ static struct snd_soc_ops s3c24xx_uda134x_ops = {
static
struct
snd_soc_dai_link
s3c24xx_uda134x_dai_link
=
{
static
struct
snd_soc_dai_link
s3c24xx_uda134x_dai_link
=
{
.
name
=
"UDA134X"
,
.
name
=
"UDA134X"
,
.
stream_name
=
"UDA134X"
,
.
stream_name
=
"UDA134X"
,
.
codec_name
=
"uda134x-
hifi
"
,
.
codec_name
=
"uda134x-
codec
"
,
.
codec_dai_name
=
"uda134x-hifi"
,
.
codec_dai_name
=
"uda134x-hifi"
,
.
cpu_dai_name
=
"s3c24xx-iis"
,
.
cpu_dai_name
=
"s3c24xx-iis"
,
.
ops
=
&
s3c24xx_uda134x_ops
,
.
ops
=
&
s3c24xx_uda134x_ops
,
...
@@ -314,6 +314,7 @@ static int s3c24xx_uda134x_probe(struct platform_device *pdev)
...
@@ -314,6 +314,7 @@ static int s3c24xx_uda134x_probe(struct platform_device *pdev)
platform_set_drvdata
(
s3c24xx_uda134x_snd_device
,
platform_set_drvdata
(
s3c24xx_uda134x_snd_device
,
&
snd_soc_s3c24xx_uda134x
);
&
snd_soc_s3c24xx_uda134x
);
platform_device_add_data
(
s3c24xx_uda134x_snd_device
,
&
s3c24xx_uda134x
,
sizeof
(
s3c24xx_uda134x
));
ret
=
platform_device_add
(
s3c24xx_uda134x_snd_device
);
ret
=
platform_device_add
(
s3c24xx_uda134x_snd_device
);
if
(
ret
)
{
if
(
ret
)
{
printk
(
KERN_ERR
"S3C24XX_UDA134X SoC Audio: Unable to add
\n
"
);
printk
(
KERN_ERR
"S3C24XX_UDA134X SoC Audio: Unable to add
\n
"
);
...
...
sound/soc/soc-core.c
浏览文件 @
ce24f58a
...
@@ -259,8 +259,6 @@ static ssize_t codec_reg_write_file(struct file *file,
...
@@ -259,8 +259,6 @@ static ssize_t codec_reg_write_file(struct file *file,
while
(
*
start
==
' '
)
while
(
*
start
==
' '
)
start
++
;
start
++
;
reg
=
simple_strtoul
(
start
,
&
start
,
16
);
reg
=
simple_strtoul
(
start
,
&
start
,
16
);
if
((
reg
>=
codec
->
driver
->
reg_cache_size
)
||
(
reg
%
step
))
return
-
EINVAL
;
while
(
*
start
==
' '
)
while
(
*
start
==
' '
)
start
++
;
start
++
;
if
(
strict_strtoul
(
start
,
16
,
&
value
))
if
(
strict_strtoul
(
start
,
16
,
&
value
))
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录