Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
bug2833
cloud-kernel
提交
87373ad1
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,发现更多精彩内容 >>
提交
87373ad1
编写于
11月 08, 2013
作者:
M
Mark Brown
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next
上级
457eb901
29ca9c73
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
12 addition
and
19 deletion
+12
-19
sound/soc/samsung/bells.c
sound/soc/samsung/bells.c
+1
-0
sound/soc/samsung/i2s.c
sound/soc/samsung/i2s.c
+8
-8
sound/soc/samsung/smdk_wm8994.c
sound/soc/samsung/smdk_wm8994.c
+3
-11
未找到文件。
sound/soc/samsung/bells.c
浏览文件 @
87373ad1
...
@@ -356,6 +356,7 @@ static struct snd_soc_dapm_widget bells_widgets[] = {
...
@@ -356,6 +356,7 @@ static struct snd_soc_dapm_widget bells_widgets[] = {
static
struct
snd_soc_dapm_route
bells_routes
[]
=
{
static
struct
snd_soc_dapm_route
bells_routes
[]
=
{
{
"Sub CLK_SYS"
,
NULL
,
"OPCLK"
},
{
"Sub CLK_SYS"
,
NULL
,
"OPCLK"
},
{
"CLKIN"
,
NULL
,
"OPCLK"
},
{
"DMIC"
,
NULL
,
"MICBIAS2"
},
{
"DMIC"
,
NULL
,
"MICBIAS2"
},
{
"IN2L"
,
NULL
,
"DMIC"
},
{
"IN2L"
,
NULL
,
"DMIC"
},
...
...
sound/soc/samsung/i2s.c
浏览文件 @
87373ad1
...
@@ -1055,7 +1055,7 @@ static struct i2s_dai *i2s_alloc_dai(struct platform_device *pdev, bool sec)
...
@@ -1055,7 +1055,7 @@ static struct i2s_dai *i2s_alloc_dai(struct platform_device *pdev, bool sec)
i2s
->
i2s_dai_drv
.
ops
=
&
samsung_i2s_dai_ops
;
i2s
->
i2s_dai_drv
.
ops
=
&
samsung_i2s_dai_ops
;
i2s
->
i2s_dai_drv
.
suspend
=
i2s_suspend
;
i2s
->
i2s_dai_drv
.
suspend
=
i2s_suspend
;
i2s
->
i2s_dai_drv
.
resume
=
i2s_resume
;
i2s
->
i2s_dai_drv
.
resume
=
i2s_resume
;
i2s
->
i2s_dai_drv
.
playback
.
channels_min
=
2
;
i2s
->
i2s_dai_drv
.
playback
.
channels_min
=
1
;
i2s
->
i2s_dai_drv
.
playback
.
channels_max
=
2
;
i2s
->
i2s_dai_drv
.
playback
.
channels_max
=
2
;
i2s
->
i2s_dai_drv
.
playback
.
rates
=
SAMSUNG_I2S_RATES
;
i2s
->
i2s_dai_drv
.
playback
.
rates
=
SAMSUNG_I2S_RATES
;
i2s
->
i2s_dai_drv
.
playback
.
formats
=
SAMSUNG_I2S_FMTS
;
i2s
->
i2s_dai_drv
.
playback
.
formats
=
SAMSUNG_I2S_FMTS
;
...
@@ -1068,7 +1068,7 @@ static struct i2s_dai *i2s_alloc_dai(struct platform_device *pdev, bool sec)
...
@@ -1068,7 +1068,7 @@ static struct i2s_dai *i2s_alloc_dai(struct platform_device *pdev, bool sec)
dev_set_drvdata
(
&
i2s
->
pdev
->
dev
,
i2s
);
dev_set_drvdata
(
&
i2s
->
pdev
->
dev
,
i2s
);
}
else
{
/* Create a new platform_device for Secondary */
}
else
{
/* Create a new platform_device for Secondary */
i2s
->
pdev
=
platform_device_alloc
(
"samsung-i2s-sec"
,
-
1
);
i2s
->
pdev
=
platform_device_alloc
(
"samsung-i2s-sec"
,
-
1
);
if
(
IS_ERR
(
i2s
->
pdev
)
)
if
(
!
i2s
->
pdev
)
return
NULL
;
return
NULL
;
i2s
->
pdev
->
dev
.
parent
=
&
pdev
->
dev
;
i2s
->
pdev
->
dev
.
parent
=
&
pdev
->
dev
;
...
@@ -1138,7 +1138,7 @@ static int samsung_i2s_probe(struct platform_device *pdev)
...
@@ -1138,7 +1138,7 @@ static int samsung_i2s_probe(struct platform_device *pdev)
dev_err
(
&
pdev
->
dev
,
"Unable to get drvdata
\n
"
);
dev_err
(
&
pdev
->
dev
,
"Unable to get drvdata
\n
"
);
return
-
EFAULT
;
return
-
EFAULT
;
}
}
snd_soc_register_component
(
&
sec_dai
->
pdev
->
dev
,
devm_
snd_soc_register_component
(
&
sec_dai
->
pdev
->
dev
,
&
samsung_i2s_component
,
&
samsung_i2s_component
,
&
sec_dai
->
i2s_dai_drv
,
1
);
&
sec_dai
->
i2s_dai_drv
,
1
);
samsung_asoc_dma_platform_register
(
&
pdev
->
dev
);
samsung_asoc_dma_platform_register
(
&
pdev
->
dev
);
...
@@ -1253,7 +1253,8 @@ static int samsung_i2s_probe(struct platform_device *pdev)
...
@@ -1253,7 +1253,8 @@ static int samsung_i2s_probe(struct platform_device *pdev)
goto
err
;
goto
err
;
}
}
snd_soc_register_component
(
&
pri_dai
->
pdev
->
dev
,
&
samsung_i2s_component
,
devm_snd_soc_register_component
(
&
pri_dai
->
pdev
->
dev
,
&
samsung_i2s_component
,
&
pri_dai
->
i2s_dai_drv
,
1
);
&
pri_dai
->
i2s_dai_drv
,
1
);
pm_runtime_enable
(
&
pdev
->
dev
);
pm_runtime_enable
(
&
pdev
->
dev
);
...
@@ -1289,7 +1290,6 @@ static int samsung_i2s_remove(struct platform_device *pdev)
...
@@ -1289,7 +1290,6 @@ static int samsung_i2s_remove(struct platform_device *pdev)
i2s
->
sec_dai
=
NULL
;
i2s
->
sec_dai
=
NULL
;
samsung_asoc_dma_platform_unregister
(
&
pdev
->
dev
);
samsung_asoc_dma_platform_unregister
(
&
pdev
->
dev
);
snd_soc_unregister_component
(
&
pdev
->
dev
);
return
0
;
return
0
;
}
}
...
...
sound/soc/samsung/smdk_wm8994.c
浏览文件 @
87373ad1
...
@@ -9,6 +9,7 @@
...
@@ -9,6 +9,7 @@
#include "../codecs/wm8994.h"
#include "../codecs/wm8994.h"
#include <sound/pcm_params.h>
#include <sound/pcm_params.h>
#include <sound/soc.h>
#include <linux/module.h>
#include <linux/module.h>
#include <linux/of.h>
#include <linux/of.h>
#include <linux/of_device.h>
#include <linux/of_device.h>
...
@@ -193,7 +194,7 @@ static int smdk_audio_probe(struct platform_device *pdev)
...
@@ -193,7 +194,7 @@ static int smdk_audio_probe(struct platform_device *pdev)
platform_set_drvdata
(
pdev
,
board
);
platform_set_drvdata
(
pdev
,
board
);
ret
=
snd_soc_register_card
(
card
);
ret
=
devm_snd_soc_register_card
(
&
pdev
->
dev
,
card
);
if
(
ret
)
if
(
ret
)
dev_err
(
&
pdev
->
dev
,
"snd_soc_register_card() failed:%d
\n
"
,
ret
);
dev_err
(
&
pdev
->
dev
,
"snd_soc_register_card() failed:%d
\n
"
,
ret
);
...
@@ -201,23 +202,14 @@ static int smdk_audio_probe(struct platform_device *pdev)
...
@@ -201,23 +202,14 @@ static int smdk_audio_probe(struct platform_device *pdev)
return
ret
;
return
ret
;
}
}
static
int
smdk_audio_remove
(
struct
platform_device
*
pdev
)
{
struct
snd_soc_card
*
card
=
platform_get_drvdata
(
pdev
);
snd_soc_unregister_card
(
card
);
return
0
;
}
static
struct
platform_driver
smdk_audio_driver
=
{
static
struct
platform_driver
smdk_audio_driver
=
{
.
driver
=
{
.
driver
=
{
.
name
=
"smdk-audio-wm8894"
,
.
name
=
"smdk-audio-wm8894"
,
.
owner
=
THIS_MODULE
,
.
owner
=
THIS_MODULE
,
.
of_match_table
=
of_match_ptr
(
samsung_wm8994_of_match
),
.
of_match_table
=
of_match_ptr
(
samsung_wm8994_of_match
),
.
pm
=
&
snd_soc_pm_ops
,
},
},
.
probe
=
smdk_audio_probe
,
.
probe
=
smdk_audio_probe
,
.
remove
=
smdk_audio_remove
,
};
};
module_platform_driver
(
smdk_audio_driver
);
module_platform_driver
(
smdk_audio_driver
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录