Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
18923d7e
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看板
提交
18923d7e
编写于
6月 17, 2013
作者:
M
Mark Brown
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'asoc/topic/hdmi' into asoc-next
上级
0d664db6
bf7c6e6c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
18 addition
and
18 deletion
+18
-18
sound/soc/codecs/Kconfig
sound/soc/codecs/Kconfig
+2
-2
sound/soc/codecs/Makefile
sound/soc/codecs/Makefile
+2
-2
sound/soc/codecs/hdmi.c
sound/soc/codecs/hdmi.c
+13
-13
sound/soc/omap/omap-hdmi-card.c
sound/soc/omap/omap-hdmi-card.c
+1
-1
未找到文件。
sound/soc/codecs/Kconfig
浏览文件 @
18923d7e
...
...
@@ -53,7 +53,7 @@ config SND_SOC_ALL_CODECS
select SND_SOC_MAX9877 if I2C
select SND_SOC_MC13783 if MFD_MC13XXX
select SND_SOC_ML26124 if I2C
select SND_SOC_
OMAP_HDMI_CODEC if OMAP4_DSS_HDMI
select SND_SOC_
HDMI_CODEC
select SND_SOC_PCM3008
select SND_SOC_RT5631 if I2C
select SND_SOC_SGTL5000 if I2C
...
...
@@ -287,7 +287,7 @@ config SND_SOC_MAX98095
config SND_SOC_MAX9850
tristate
config SND_SOC_
OMAP_
HDMI_CODEC
config SND_SOC_HDMI_CODEC
tristate
config SND_SOC_PCM3008
...
...
sound/soc/codecs/Makefile
浏览文件 @
18923d7e
...
...
@@ -41,7 +41,7 @@ snd-soc-max98095-objs := max98095.o
snd-soc-max9850-objs
:=
max9850.o
snd-soc-mc13783-objs
:=
mc13783.o
snd-soc-ml26124-objs
:=
ml26124.o
snd-soc-
omap-hdmi-codec-objs
:=
omap-
hdmi.o
snd-soc-
hdmi-codec-objs
:=
hdmi.o
snd-soc-pcm3008-objs
:=
pcm3008.o
snd-soc-rt5631-objs
:=
rt5631.o
snd-soc-sgtl5000-objs
:=
sgtl5000.o
...
...
@@ -168,7 +168,7 @@ obj-$(CONFIG_SND_SOC_MAX98095) += snd-soc-max98095.o
obj-$(CONFIG_SND_SOC_MAX9850)
+=
snd-soc-max9850.o
obj-$(CONFIG_SND_SOC_MC13783)
+=
snd-soc-mc13783.o
obj-$(CONFIG_SND_SOC_ML26124)
+=
snd-soc-ml26124.o
obj-$(CONFIG_SND_SOC_
OMAP_HDMI_CODEC)
+=
snd-soc-omap
-hdmi-codec.o
obj-$(CONFIG_SND_SOC_
HDMI_CODEC)
+=
snd-soc
-hdmi-codec.o
obj-$(CONFIG_SND_SOC_PCM3008)
+=
snd-soc-pcm3008.o
obj-$(CONFIG_SND_SOC_RT5631)
+=
snd-soc-rt5631.o
obj-$(CONFIG_SND_SOC_SGTL5000)
+=
snd-soc-sgtl5000.o
...
...
sound/soc/codecs/
omap-
hdmi.c
→
sound/soc/codecs/hdmi.c
浏览文件 @
18923d7e
/*
* ALSA SoC codec driver for HDMI audio
on OMAP processor
s.
* ALSA SoC codec driver for HDMI audio
codec
s.
* Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
* Author: Ricardo Neri <ricardo.neri@ti.com>
*
...
...
@@ -23,10 +23,10 @@
#define DRV_NAME "hdmi-audio-codec"
static
struct
snd_soc_codec_driver
omap_
hdmi_codec
;
static
struct
snd_soc_codec_driver
hdmi_codec
;
static
struct
snd_soc_dai_driver
omap_
hdmi_codec_dai
=
{
.
name
=
"
omap-
hdmi-hifi"
,
static
struct
snd_soc_dai_driver
hdmi_codec_dai
=
{
.
name
=
"hdmi-hifi"
,
.
playback
=
{
.
channels_min
=
2
,
.
channels_max
=
8
,
...
...
@@ -39,31 +39,31 @@ static struct snd_soc_dai_driver omap_hdmi_codec_dai = {
},
};
static
int
omap_
hdmi_codec_probe
(
struct
platform_device
*
pdev
)
static
int
hdmi_codec_probe
(
struct
platform_device
*
pdev
)
{
return
snd_soc_register_codec
(
&
pdev
->
dev
,
&
omap_
hdmi_codec
,
&
omap_
hdmi_codec_dai
,
1
);
return
snd_soc_register_codec
(
&
pdev
->
dev
,
&
hdmi_codec
,
&
hdmi_codec_dai
,
1
);
}
static
int
omap_
hdmi_codec_remove
(
struct
platform_device
*
pdev
)
static
int
hdmi_codec_remove
(
struct
platform_device
*
pdev
)
{
snd_soc_unregister_codec
(
&
pdev
->
dev
);
return
0
;
}
static
struct
platform_driver
omap_
hdmi_codec_driver
=
{
static
struct
platform_driver
hdmi_codec_driver
=
{
.
driver
=
{
.
name
=
DRV_NAME
,
.
owner
=
THIS_MODULE
,
},
.
probe
=
omap_
hdmi_codec_probe
,
.
remove
=
omap_
hdmi_codec_remove
,
.
probe
=
hdmi_codec_probe
,
.
remove
=
hdmi_codec_remove
,
};
module_platform_driver
(
omap_
hdmi_codec_driver
);
module_platform_driver
(
hdmi_codec_driver
);
MODULE_AUTHOR
(
"Ricardo Neri <ricardo.neri@ti.com>"
);
MODULE_DESCRIPTION
(
"ASoC
OMAP
HDMI codec driver"
);
MODULE_DESCRIPTION
(
"ASoC
generic
HDMI codec driver"
);
MODULE_LICENSE
(
"GPL"
);
MODULE_ALIAS
(
"platform:"
DRV_NAME
);
sound/soc/omap/omap-hdmi-card.c
浏览文件 @
18923d7e
...
...
@@ -35,7 +35,7 @@ static struct snd_soc_dai_link omap_hdmi_dai = {
.
cpu_dai_name
=
"omap-hdmi-audio-dai"
,
.
platform_name
=
"omap-pcm-audio"
,
.
codec_name
=
"hdmi-audio-codec"
,
.
codec_dai_name
=
"
omap-
hdmi-hifi"
,
.
codec_dai_name
=
"hdmi-hifi"
,
};
static
struct
snd_soc_card
snd_soc_omap_hdmi
=
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录