Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xiphi1978
linux
提交
52593de4
L
linux
项目概览
xiphi1978
/
linux
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
52593de4
编写于
5月 29, 2010
作者:
T
Takashi Iwai
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'fix/asoc' into for-linus
上级
d2192121
274a24c1
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
26 addition
and
23 deletion
+26
-23
sound/soc/codecs/wm8350.c
sound/soc/codecs/wm8350.c
+2
-2
sound/soc/codecs/wm8400.c
sound/soc/codecs/wm8400.c
+9
-9
sound/soc/codecs/wm8990.c
sound/soc/codecs/wm8990.c
+9
-9
sound/soc/imx/imx-pcm-dma-mx2.c
sound/soc/imx/imx-pcm-dma-mx2.c
+4
-3
sound/soc/sh/siu_dai.c
sound/soc/sh/siu_dai.c
+2
-0
未找到文件。
sound/soc/codecs/wm8350.c
浏览文件 @
52593de4
...
@@ -426,8 +426,8 @@ static const struct soc_enum wm8350_enum[] = {
...
@@ -426,8 +426,8 @@ static const struct soc_enum wm8350_enum[] = {
SOC_ENUM_SINGLE
(
WM8350_INPUT_MIXER_VOLUME
,
15
,
2
,
wm8350_lr
),
SOC_ENUM_SINGLE
(
WM8350_INPUT_MIXER_VOLUME
,
15
,
2
,
wm8350_lr
),
};
};
static
DECLARE_TLV_DB_
LINEAR
(
pre_amp_tlv
,
-
1200
,
3525
);
static
DECLARE_TLV_DB_
SCALE
(
pre_amp_tlv
,
-
1200
,
3525
,
0
);
static
DECLARE_TLV_DB_
LINEAR
(
out_pga_tlv
,
-
5700
,
60
0
);
static
DECLARE_TLV_DB_
SCALE
(
out_pga_tlv
,
-
5700
,
600
,
0
);
static
DECLARE_TLV_DB_SCALE
(
dac_pcm_tlv
,
-
7163
,
36
,
1
);
static
DECLARE_TLV_DB_SCALE
(
dac_pcm_tlv
,
-
7163
,
36
,
1
);
static
DECLARE_TLV_DB_SCALE
(
adc_pcm_tlv
,
-
12700
,
50
,
1
);
static
DECLARE_TLV_DB_SCALE
(
adc_pcm_tlv
,
-
12700
,
50
,
1
);
static
DECLARE_TLV_DB_SCALE
(
out_mix_tlv
,
-
1500
,
300
,
1
);
static
DECLARE_TLV_DB_SCALE
(
out_mix_tlv
,
-
1500
,
300
,
1
);
...
...
sound/soc/codecs/wm8400.c
浏览文件 @
52593de4
...
@@ -107,21 +107,21 @@ static void wm8400_codec_reset(struct snd_soc_codec *codec)
...
@@ -107,21 +107,21 @@ static void wm8400_codec_reset(struct snd_soc_codec *codec)
wm8400_reset_codec_reg_cache
(
wm8400
->
wm8400
);
wm8400_reset_codec_reg_cache
(
wm8400
->
wm8400
);
}
}
static
const
DECLARE_TLV_DB_
LINEAR
(
rec_mix_tlv
,
-
1500
,
60
0
);
static
const
DECLARE_TLV_DB_
SCALE
(
rec_mix_tlv
,
-
1500
,
600
,
0
);
static
const
DECLARE_TLV_DB_
LINEAR
(
in_pga_tlv
,
-
1650
,
300
0
);
static
const
DECLARE_TLV_DB_
SCALE
(
in_pga_tlv
,
-
1650
,
3000
,
0
);
static
const
DECLARE_TLV_DB_
LINEAR
(
out_mix_tlv
,
-
210
0
,
0
);
static
const
DECLARE_TLV_DB_
SCALE
(
out_mix_tlv
,
-
2100
,
0
,
0
);
static
const
DECLARE_TLV_DB_
LINEAR
(
out_pga_tlv
,
-
7300
,
60
0
);
static
const
DECLARE_TLV_DB_
SCALE
(
out_pga_tlv
,
-
7300
,
600
,
0
);
static
const
DECLARE_TLV_DB_
LINEAR
(
out_omix_tlv
,
-
60
0
,
0
);
static
const
DECLARE_TLV_DB_
SCALE
(
out_omix_tlv
,
-
600
,
0
,
0
);
static
const
DECLARE_TLV_DB_
LINEAR
(
out_dac_tlv
,
-
7163
,
0
);
static
const
DECLARE_TLV_DB_
SCALE
(
out_dac_tlv
,
-
7163
,
0
,
0
);
static
const
DECLARE_TLV_DB_
LINEAR
(
in_adc_tlv
,
-
7163
,
1763
);
static
const
DECLARE_TLV_DB_
SCALE
(
in_adc_tlv
,
-
7163
,
1763
,
0
);
static
const
DECLARE_TLV_DB_
LINEAR
(
out_sidetone_tlv
,
-
360
0
,
0
);
static
const
DECLARE_TLV_DB_
SCALE
(
out_sidetone_tlv
,
-
3600
,
0
,
0
);
static
int
wm8400_outpga_put_volsw_vu
(
struct
snd_kcontrol
*
kcontrol
,
static
int
wm8400_outpga_put_volsw_vu
(
struct
snd_kcontrol
*
kcontrol
,
struct
snd_ctl_elem_value
*
ucontrol
)
struct
snd_ctl_elem_value
*
ucontrol
)
...
@@ -440,7 +440,7 @@ static int outmixer_event (struct snd_soc_dapm_widget *w,
...
@@ -440,7 +440,7 @@ static int outmixer_event (struct snd_soc_dapm_widget *w,
/* INMIX dB values */
/* INMIX dB values */
static
const
unsigned
int
in_mix_tlv
[]
=
{
static
const
unsigned
int
in_mix_tlv
[]
=
{
TLV_DB_RANGE_HEAD
(
1
),
TLV_DB_RANGE_HEAD
(
1
),
0
,
7
,
TLV_DB_
LINEAR_ITEM
(
-
1200
,
60
0
),
0
,
7
,
TLV_DB_
SCALE_ITEM
(
-
1200
,
600
,
0
),
};
};
/* Left In PGA Connections */
/* Left In PGA Connections */
...
...
sound/soc/codecs/wm8990.c
浏览文件 @
52593de4
...
@@ -111,21 +111,21 @@ static const u16 wm8990_reg[] = {
...
@@ -111,21 +111,21 @@ static const u16 wm8990_reg[] = {
#define wm8990_reset(c) snd_soc_write(c, WM8990_RESET, 0)
#define wm8990_reset(c) snd_soc_write(c, WM8990_RESET, 0)
static
const
DECLARE_TLV_DB_
LINEAR
(
rec_mix_tlv
,
-
1500
,
60
0
);
static
const
DECLARE_TLV_DB_
SCALE
(
rec_mix_tlv
,
-
1500
,
600
,
0
);
static
const
DECLARE_TLV_DB_
LINEAR
(
in_pga_tlv
,
-
1650
,
300
0
);
static
const
DECLARE_TLV_DB_
SCALE
(
in_pga_tlv
,
-
1650
,
3000
,
0
);
static
const
DECLARE_TLV_DB_
LINEAR
(
out_mix_tlv
,
0
,
-
210
0
);
static
const
DECLARE_TLV_DB_
SCALE
(
out_mix_tlv
,
0
,
-
2100
,
0
);
static
const
DECLARE_TLV_DB_
LINEAR
(
out_pga_tlv
,
-
7300
,
60
0
);
static
const
DECLARE_TLV_DB_
SCALE
(
out_pga_tlv
,
-
7300
,
600
,
0
);
static
const
DECLARE_TLV_DB_
LINEAR
(
out_omix_tlv
,
-
60
0
,
0
);
static
const
DECLARE_TLV_DB_
SCALE
(
out_omix_tlv
,
-
600
,
0
,
0
);
static
const
DECLARE_TLV_DB_
LINEAR
(
out_dac_tlv
,
-
7163
,
0
);
static
const
DECLARE_TLV_DB_
SCALE
(
out_dac_tlv
,
-
7163
,
0
,
0
);
static
const
DECLARE_TLV_DB_
LINEAR
(
in_adc_tlv
,
-
7163
,
1763
);
static
const
DECLARE_TLV_DB_
SCALE
(
in_adc_tlv
,
-
7163
,
1763
,
0
);
static
const
DECLARE_TLV_DB_
LINEAR
(
out_sidetone_tlv
,
-
360
0
,
0
);
static
const
DECLARE_TLV_DB_
SCALE
(
out_sidetone_tlv
,
-
3600
,
0
,
0
);
static
int
wm899x_outpga_put_volsw_vu
(
struct
snd_kcontrol
*
kcontrol
,
static
int
wm899x_outpga_put_volsw_vu
(
struct
snd_kcontrol
*
kcontrol
,
struct
snd_ctl_elem_value
*
ucontrol
)
struct
snd_ctl_elem_value
*
ucontrol
)
...
@@ -451,7 +451,7 @@ static int outmixer_event(struct snd_soc_dapm_widget *w,
...
@@ -451,7 +451,7 @@ static int outmixer_event(struct snd_soc_dapm_widget *w,
/* INMIX dB values */
/* INMIX dB values */
static
const
unsigned
int
in_mix_tlv
[]
=
{
static
const
unsigned
int
in_mix_tlv
[]
=
{
TLV_DB_RANGE_HEAD
(
1
),
TLV_DB_RANGE_HEAD
(
1
),
0
,
7
,
TLV_DB_
LINEAR_ITEM
(
-
1200
,
60
0
),
0
,
7
,
TLV_DB_
SCALE_ITEM
(
-
1200
,
600
,
0
),
};
};
/* Left In PGA Connections */
/* Left In PGA Connections */
...
...
sound/soc/imx/imx-pcm-dma-mx2.c
浏览文件 @
52593de4
...
@@ -73,7 +73,8 @@ static void snd_imx_dma_err_callback(int channel, void *data, int err)
...
@@ -73,7 +73,8 @@ static void snd_imx_dma_err_callback(int channel, void *data, int err)
{
{
struct
snd_pcm_substream
*
substream
=
data
;
struct
snd_pcm_substream
*
substream
=
data
;
struct
snd_soc_pcm_runtime
*
rtd
=
substream
->
private_data
;
struct
snd_soc_pcm_runtime
*
rtd
=
substream
->
private_data
;
struct
imx_pcm_dma_params
*
dma_params
=
rtd
->
dai
->
cpu_dai
->
dma_data
;
struct
imx_pcm_dma_params
*
dma_params
=
snd_soc_dai_get_dma_data
(
rtd
->
dai
->
cpu_dai
,
substream
);
struct
snd_pcm_runtime
*
runtime
=
substream
->
runtime
;
struct
snd_pcm_runtime
*
runtime
=
substream
->
runtime
;
struct
imx_pcm_runtime_data
*
iprtd
=
runtime
->
private_data
;
struct
imx_pcm_runtime_data
*
iprtd
=
runtime
->
private_data
;
int
ret
;
int
ret
;
...
@@ -102,7 +103,7 @@ static int imx_ssi_dma_alloc(struct snd_pcm_substream *substream)
...
@@ -102,7 +103,7 @@ static int imx_ssi_dma_alloc(struct snd_pcm_substream *substream)
struct
imx_pcm_runtime_data
*
iprtd
=
runtime
->
private_data
;
struct
imx_pcm_runtime_data
*
iprtd
=
runtime
->
private_data
;
int
ret
;
int
ret
;
dma_params
=
snd_soc_get_dma_data
(
rtd
->
dai
->
cpu_dai
,
substream
);
dma_params
=
snd_soc_
dai_
get_dma_data
(
rtd
->
dai
->
cpu_dai
,
substream
);
iprtd
->
dma
=
imx_dma_request_by_prio
(
DRV_NAME
,
DMA_PRIO_HIGH
);
iprtd
->
dma
=
imx_dma_request_by_prio
(
DRV_NAME
,
DMA_PRIO_HIGH
);
if
(
iprtd
->
dma
<
0
)
{
if
(
iprtd
->
dma
<
0
)
{
...
@@ -212,7 +213,7 @@ static int snd_imx_pcm_prepare(struct snd_pcm_substream *substream)
...
@@ -212,7 +213,7 @@ static int snd_imx_pcm_prepare(struct snd_pcm_substream *substream)
struct
imx_pcm_runtime_data
*
iprtd
=
runtime
->
private_data
;
struct
imx_pcm_runtime_data
*
iprtd
=
runtime
->
private_data
;
int
err
;
int
err
;
dma_params
=
snd_soc_get_dma_data
(
rtd
->
dai
->
cpu_dai
,
substream
);
dma_params
=
snd_soc_
dai_
get_dma_data
(
rtd
->
dai
->
cpu_dai
,
substream
);
iprtd
->
substream
=
substream
;
iprtd
->
substream
=
substream
;
iprtd
->
buf
=
(
unsigned
int
*
)
substream
->
dma_buffer
.
area
;
iprtd
->
buf
=
(
unsigned
int
*
)
substream
->
dma_buffer
.
area
;
...
...
sound/soc/sh/siu_dai.c
浏览文件 @
52593de4
...
@@ -588,6 +588,8 @@ static int siu_dai_prepare(struct snd_pcm_substream *substream,
...
@@ -588,6 +588,8 @@ static int siu_dai_prepare(struct snd_pcm_substream *substream,
ret
=
siu_dai_spbstart
(
port_info
);
ret
=
siu_dai_spbstart
(
port_info
);
if
(
ret
<
0
)
if
(
ret
<
0
)
goto
fail
;
goto
fail
;
}
else
{
ret
=
0
;
}
}
port_info
->
play_cap
|=
self
;
port_info
->
play_cap
|=
self
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录