Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
425c5a85
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看板
提交
425c5a85
编写于
11月 03, 2013
作者:
M
Mark Brown
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'asoc/topic/adsp' into asoc-next
上级
14d90774
3626992a
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
20 addition
and
7 deletion
+20
-7
sound/soc/codecs/wm_adsp.c
sound/soc/codecs/wm_adsp.c
+20
-7
未找到文件。
sound/soc/codecs/wm_adsp.c
浏览文件 @
425c5a85
...
...
@@ -396,11 +396,12 @@ static int wm_coeff_write_control(struct snd_kcontrol *kcontrol,
ret
=
regmap_raw_write
(
adsp
->
regmap
,
reg
,
scratch
,
ctl
->
len
);
if
(
ret
)
{
adsp_err
(
adsp
,
"Failed to write %zu bytes to %x
\n
"
,
ctl
->
len
,
reg
);
adsp_err
(
adsp
,
"Failed to write %zu bytes to %x
: %d
\n
"
,
ctl
->
len
,
reg
,
ret
);
kfree
(
scratch
);
return
ret
;
}
adsp_dbg
(
adsp
,
"Wrote %zu bytes to %x
\n
"
,
ctl
->
len
,
reg
);
kfree
(
scratch
);
...
...
@@ -450,11 +451,12 @@ static int wm_coeff_read_control(struct snd_kcontrol *kcontrol,
ret
=
regmap_raw_read
(
adsp
->
regmap
,
reg
,
scratch
,
ctl
->
len
);
if
(
ret
)
{
adsp_err
(
adsp
,
"Failed to read %zu bytes from %x
\n
"
,
ctl
->
len
,
reg
);
adsp_err
(
adsp
,
"Failed to read %zu bytes from %x
: %d
\n
"
,
ctl
->
len
,
reg
,
ret
);
kfree
(
scratch
);
return
ret
;
}
adsp_dbg
(
adsp
,
"Read %zu bytes from %x
\n
"
,
ctl
->
len
,
reg
);
memcpy
(
buf
,
scratch
,
ctl
->
len
);
kfree
(
scratch
);
...
...
@@ -568,6 +570,7 @@ static int wm_adsp_load(struct wm_adsp *dsp)
file
,
header
->
ver
);
goto
out_fw
;
}
adsp_info
(
dsp
,
"Firmware version: %d
\n
"
,
header
->
ver
);
if
(
header
->
core
!=
dsp
->
type
)
{
adsp_err
(
dsp
,
"%s: invalid core %d != %d
\n
"
,
...
...
@@ -689,7 +692,8 @@ static int wm_adsp_load(struct wm_adsp *dsp)
&
buf_list
);
if
(
!
buf
)
{
adsp_err
(
dsp
,
"Out of memory
\n
"
);
return
-
ENOMEM
;
ret
=
-
ENOMEM
;
goto
out_fw
;
}
ret
=
regmap_raw_write_async
(
regmap
,
reg
,
buf
->
buf
,
...
...
@@ -1313,8 +1317,8 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp)
le32_to_cpu
(
blk
->
len
));
if
(
ret
!=
0
)
{
adsp_err
(
dsp
,
"%s.%d: Failed to write to %x in %s
\n
"
,
file
,
blocks
,
reg
,
region_name
);
"%s.%d: Failed to write to %x in %s
: %d
\n
"
,
file
,
blocks
,
reg
,
region_name
,
ret
);
}
}
...
...
@@ -1358,6 +1362,7 @@ int wm_adsp1_event(struct snd_soc_dapm_widget *w,
struct
snd_soc_codec
*
codec
=
w
->
codec
;
struct
wm_adsp
*
dsps
=
snd_soc_codec_get_drvdata
(
codec
);
struct
wm_adsp
*
dsp
=
&
dsps
[
w
->
shift
];
struct
wm_adsp_alg_region
*
alg_region
;
struct
wm_coeff_ctl
*
ctl
;
int
ret
;
int
val
;
...
...
@@ -1435,6 +1440,14 @@ int wm_adsp1_event(struct snd_soc_dapm_widget *w,
list_for_each_entry
(
ctl
,
&
dsp
->
ctl_list
,
list
)
ctl
->
enabled
=
0
;
while
(
!
list_empty
(
&
dsp
->
alg_regions
))
{
alg_region
=
list_first_entry
(
&
dsp
->
alg_regions
,
struct
wm_adsp_alg_region
,
list
);
list_del
(
&
alg_region
->
list
);
kfree
(
alg_region
);
}
break
;
default:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录