Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
339425f4
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看板
提交
339425f4
编写于
12月 10, 2012
作者:
M
Mark Brown
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'asoc/fix/omap' into asoc-next
上级
f2818d07
5f02ee56
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
13 addition
and
17 deletion
+13
-17
Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt
Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt
+2
-2
sound/soc/omap/mcbsp.c
sound/soc/omap/mcbsp.c
+1
-3
sound/soc/omap/mcbsp.h
sound/soc/omap/mcbsp.h
+6
-0
sound/soc/omap/omap-abe-twl6040.c
sound/soc/omap/omap-abe-twl6040.c
+2
-2
sound/soc/omap/omap-mcbsp.c
sound/soc/omap/omap-mcbsp.c
+2
-3
sound/soc/omap/zoom2.c
sound/soc/omap/zoom2.c
+0
-7
未找到文件。
Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt
浏览文件 @
339425f4
...
...
@@ -12,7 +12,7 @@ Required properties:
Optional properties:
- ti,dmic: phandle for the OMAP dmic node if the machine have it connected
- ti,jack_detection: Need to be
set to <1>
if the board capable to detect jack
- ti,jack_detection: Need to be
present
if the board capable to detect jack
insertion, removal.
Available audio endpoints for the audio-routing table:
...
...
@@ -59,7 +59,7 @@ sound {
compatible = "ti,abe-twl6040";
ti,model = "SDP4430";
ti,jack-detection
= <1>
;
ti,jack-detection;
ti,mclk-freq = <38400000>;
ti,mcpdm = <&mcpdm>;
...
...
sound/soc/omap/mcbsp.c
浏览文件 @
339425f4
...
...
@@ -28,8 +28,6 @@
#include <linux/platform_data/asoc-ti-mcbsp.h>
#include <plat/cpu.h>
#include "mcbsp.h"
static
void
omap_mcbsp_write
(
struct
omap_mcbsp
*
mcbsp
,
u16
reg
,
u32
val
)
...
...
@@ -612,7 +610,7 @@ void omap_mcbsp_free(struct omap_mcbsp *mcbsp)
* system will refuse to enter idle if the CLKS pin source is not reset
* back to internal source.
*/
if
(
!
cpu_class_is
_omap1
())
if
(
!
mcbsp
_omap1
())
omap2_mcbsp_set_clks_src
(
mcbsp
,
MCBSP_CLKS_PRCM_SRC
);
spin_lock
(
&
mcbsp
->
lock
);
...
...
sound/soc/omap/mcbsp.h
浏览文件 @
339425f4
...
...
@@ -26,6 +26,12 @@
#include "omap-pcm.h"
#ifdef CONFIG_ARCH_OMAP1
#define mcbsp_omap1() 1
#else
#define mcbsp_omap1() 0
#endif
/* McBSP register numbers. Register address offset = num * reg_step */
enum
{
/* Common registers */
...
...
sound/soc/omap/omap-abe-twl6040.c
浏览文件 @
339425f4
...
...
@@ -331,8 +331,8 @@ static __devinit int omap_abe_probe(struct platform_device *pdev)
num_links
=
1
;
}
of_property_read_u32
(
node
,
"ti,jack-detection"
,
&
priv
->
jack_detection
);
priv
->
jack_detection
=
of_property_read_bool
(
node
,
"ti,jack-detection"
);
of_property_read_u32
(
node
,
"ti,mclk-freq"
,
&
priv
->
mclk_freq
);
if
(
!
priv
->
mclk_freq
)
{
...
...
sound/soc/omap/omap-mcbsp.c
浏览文件 @
339425f4
...
...
@@ -34,7 +34,6 @@
#include <sound/initval.h>
#include <sound/soc.h>
#include <plat/cpu.h>
#include <linux/platform_data/asoc-ti-mcbsp.h>
#include "mcbsp.h"
#include "omap-mcbsp.h"
...
...
@@ -512,7 +511,7 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
regs
->
srgr2
|=
CLKSM
;
break
;
case
OMAP_MCBSP_SYSCLK_CLKS_FCLK
:
if
(
cpu_class_is
_omap1
())
{
if
(
mcbsp
_omap1
())
{
err
=
-
EINVAL
;
break
;
}
...
...
@@ -520,7 +519,7 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
MCBSP_CLKS_PRCM_SRC
);
break
;
case
OMAP_MCBSP_SYSCLK_CLKS_EXT
:
if
(
cpu_class_is
_omap1
())
{
if
(
mcbsp
_omap1
())
{
err
=
0
;
break
;
}
...
...
sound/soc/omap/zoom2.c
浏览文件 @
339425f4
...
...
@@ -37,8 +37,6 @@
#include "omap-mcbsp.h"
#include "omap-pcm.h"
#define ZOOM2_HEADSET_MUX_GPIO (OMAP_MAX_GPIO_LINES + 15)
static
int
zoom2_hw_params
(
struct
snd_pcm_substream
*
substream
,
struct
snd_pcm_hw_params
*
params
)
{
...
...
@@ -187,9 +185,6 @@ static int __init zoom2_soc_init(void)
if
(
ret
)
goto
err1
;
BUG_ON
(
gpio_request
(
ZOOM2_HEADSET_MUX_GPIO
,
"hs_mux"
)
<
0
);
gpio_direction_output
(
ZOOM2_HEADSET_MUX_GPIO
,
0
);
return
0
;
err1:
...
...
@@ -202,8 +197,6 @@ module_init(zoom2_soc_init);
static
void
__exit
zoom2_soc_exit
(
void
)
{
gpio_free
(
ZOOM2_HEADSET_MUX_GPIO
);
platform_device_unregister
(
zoom2_snd_device
);
}
module_exit
(
zoom2_soc_exit
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录