Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
555df91a
cloud-kernel
项目概览
openanolis
/
cloud-kernel
大约 1 年 前同步成功
通知
153
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
555df91a
编写于
2月 11, 2013
作者:
M
Mark Brown
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-next
上级
fa10a92b
346f1d40
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
36 addition
and
17 deletion
+36
-17
Documentation/devicetree/bindings/sound/wm8962.txt
Documentation/devicetree/bindings/sound/wm8962.txt
+16
-0
sound/soc/codecs/wm8962.c
sound/soc/codecs/wm8962.c
+20
-17
未找到文件。
Documentation/devicetree/bindings/sound/wm8962.txt
0 → 100644
浏览文件 @
555df91a
WM8962 audio CODEC
This device supports I2C only.
Required properties:
- compatible : "wlf,wm8962"
- reg : the I2C address of the device.
Example:
codec: wm8962@1a {
compatible = "wlf,wm8962";
reg = <0x1a>;
};
sound/soc/codecs/wm8962.c
浏览文件 @
555df91a
...
...
@@ -2873,22 +2873,20 @@ static int wm8962_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
ret
=
0
;
if
(
fll1
&
WM8962_FLL_ENA
)
{
/* This should be a massive overestimate but go even
* higher if we'll error out
*/
if
(
wm8962
->
irq
)
timeout
=
msecs_to_jiffies
(
5
);
else
timeout
=
msecs_to_jiffies
(
1
);
/* This should be a massive overestimate but go even
* higher if we'll error out
*/
if
(
wm8962
->
irq
)
timeout
=
msecs_to_jiffies
(
5
);
else
timeout
=
msecs_to_jiffies
(
1
);
timeout
=
wait_for_completion_timeout
(
&
wm8962
->
fll_lock
,
timeout
);
timeout
=
wait_for_completion_timeout
(
&
wm8962
->
fll_lock
,
timeout
);
if
(
timeout
==
0
&&
wm8962
->
irq
)
{
dev_err
(
codec
->
dev
,
"FLL lock timed out"
);
ret
=
-
ETIMEDOUT
;
}
if
(
timeout
==
0
&&
wm8962
->
irq
)
{
dev_err
(
codec
->
dev
,
"FLL lock timed out"
);
ret
=
-
ETIMEDOUT
;
}
wm8962
->
fll_fref
=
Fref
;
...
...
@@ -3189,7 +3187,7 @@ static void wm8962_init_beep(struct snd_soc_codec *codec)
struct
wm8962_priv
*
wm8962
=
snd_soc_codec_get_drvdata
(
codec
);
int
ret
;
wm8962
->
beep
=
input_allocate_device
(
);
wm8962
->
beep
=
devm_input_allocate_device
(
codec
->
dev
);
if
(
!
wm8962
->
beep
)
{
dev_err
(
codec
->
dev
,
"Failed to allocate beep device
\n
"
);
return
;
...
...
@@ -3210,7 +3208,6 @@ static void wm8962_init_beep(struct snd_soc_codec *codec)
ret
=
input_register_device
(
wm8962
->
beep
);
if
(
ret
!=
0
)
{
input_free_device
(
wm8962
->
beep
);
wm8962
->
beep
=
NULL
;
dev_err
(
codec
->
dev
,
"Failed to register beep device
\n
"
);
}
...
...
@@ -3227,7 +3224,6 @@ static void wm8962_free_beep(struct snd_soc_codec *codec)
struct
wm8962_priv
*
wm8962
=
snd_soc_codec_get_drvdata
(
codec
);
device_remove_file
(
codec
->
dev
,
&
dev_attr_beep
);
input_unregister_device
(
wm8962
->
beep
);
cancel_work_sync
(
&
wm8962
->
beep_work
);
wm8962
->
beep
=
NULL
;
...
...
@@ -3758,10 +3754,17 @@ static const struct i2c_device_id wm8962_i2c_id[] = {
};
MODULE_DEVICE_TABLE
(
i2c
,
wm8962_i2c_id
);
static
const
struct
of_device_id
wm8962_of_match
[]
=
{
{
.
compatible
=
"wlf,wm8962"
,
},
{
}
};
MODULE_DEVICE_TABLE
(
of
,
wm8962_of_match
);
static
struct
i2c_driver
wm8962_i2c_driver
=
{
.
driver
=
{
.
name
=
"wm8962"
,
.
owner
=
THIS_MODULE
,
.
of_match_table
=
wm8962_of_match
,
.
pm
=
&
wm8962_pm
,
},
.
probe
=
wm8962_i2c_probe
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录