Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xiphi1978
linux
提交
6bcbf64a
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,发现更多精彩内容 >>
提交
6bcbf64a
编写于
11月 03, 2011
作者:
T
Takashi Iwai
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'fix/asoc' into for-linus
上级
51e4152a
0b7dd6ad
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
34 addition
and
18 deletion
+34
-18
sound/soc/codecs/tlv320aic23.c
sound/soc/codecs/tlv320aic23.c
+1
-0
sound/soc/codecs/tlv320aic3x.c
sound/soc/codecs/tlv320aic3x.c
+1
-0
sound/soc/codecs/wm5100.c
sound/soc/codecs/wm5100.c
+8
-4
sound/soc/codecs/wm8711.c
sound/soc/codecs/wm8711.c
+2
-2
sound/soc/codecs/wm8904.c
sound/soc/codecs/wm8904.c
+1
-1
sound/soc/codecs/wm8940.c
sound/soc/codecs/wm8940.c
+1
-1
sound/soc/codecs/wm8962.c
sound/soc/codecs/wm8962.c
+20
-10
未找到文件。
sound/soc/codecs/tlv320aic23.c
浏览文件 @
6bcbf64a
...
...
@@ -430,6 +430,7 @@ static int tlv320aic23_set_dai_fmt(struct snd_soc_dai *codec_dai,
iface_reg
|=
TLV320AIC23_MS_MASTER
;
break
;
case
SND_SOC_DAIFMT_CBS_CFS
:
iface_reg
&=
~
TLV320AIC23_MS_MASTER
;
break
;
default:
return
-
EINVAL
;
...
...
sound/soc/codecs/tlv320aic3x.c
浏览文件 @
6bcbf64a
...
...
@@ -1023,6 +1023,7 @@ static int aic3x_set_dai_fmt(struct snd_soc_dai *codec_dai,
break
;
case
SND_SOC_DAIFMT_CBS_CFS
:
aic3x
->
master
=
0
;
iface_areg
&=
~
(
BIT_CLK_MASTER
|
WORD_CLK_MASTER
);
break
;
default:
return
-
EINVAL
;
...
...
sound/soc/codecs/wm5100.c
浏览文件 @
6bcbf64a
...
...
@@ -2361,13 +2361,17 @@ static int wm5100_gpio_direction_out(struct gpio_chip *chip,
{
struct
wm5100_priv
*
wm5100
=
gpio_to_wm5100
(
chip
);
struct
snd_soc_codec
*
codec
=
wm5100
->
codec
;
int
val
;
int
val
,
ret
;
val
=
(
1
<<
WM5100_GP1_FN_SHIFT
)
|
(
!!
value
<<
WM5100_GP1_LVL_SHIFT
);
return
snd_soc_update_bits
(
codec
,
WM5100_GPIO_CTRL_1
+
offset
,
WM5100_GP1_FN_MASK
|
WM5100_GP1_DIR
|
WM5100_GP1_LVL
,
val
);
ret
=
snd_soc_update_bits
(
codec
,
WM5100_GPIO_CTRL_1
+
offset
,
WM5100_GP1_FN_MASK
|
WM5100_GP1_DIR
|
WM5100_GP1_LVL
,
val
);
if
(
ret
<
0
)
return
ret
;
else
return
0
;
}
static
int
wm5100_gpio_get
(
struct
gpio_chip
*
chip
,
unsigned
offset
)
...
...
sound/soc/codecs/wm8711.c
浏览文件 @
6bcbf64a
...
...
@@ -151,7 +151,7 @@ static int wm8711_hw_params(struct snd_pcm_substream *substream,
{
struct
snd_soc_codec
*
codec
=
dai
->
codec
;
struct
wm8711_priv
*
wm8711
=
snd_soc_codec_get_drvdata
(
codec
);
u16
iface
=
snd_soc_read
(
codec
,
WM8711_IFACE
)
&
0xfff
c
;
u16
iface
=
snd_soc_read
(
codec
,
WM8711_IFACE
)
&
0xfff
3
;
int
i
=
get_coeff
(
wm8711
->
sysclk
,
params_rate
(
params
));
u16
srate
=
(
coeff_div
[
i
].
sr
<<
2
)
|
(
coeff_div
[
i
].
bosr
<<
1
)
|
coeff_div
[
i
].
usb
;
...
...
@@ -232,7 +232,7 @@ static int wm8711_set_dai_fmt(struct snd_soc_dai *codec_dai,
unsigned
int
fmt
)
{
struct
snd_soc_codec
*
codec
=
codec_dai
->
codec
;
u16
iface
=
0
;
u16
iface
=
snd_soc_read
(
codec
,
WM8711_IFACE
)
&
0x000c
;
/* set master/slave audio interface */
switch
(
fmt
&
SND_SOC_DAIFMT_MASTER_MASK
)
{
...
...
sound/soc/codecs/wm8904.c
浏览文件 @
6bcbf64a
...
...
@@ -867,7 +867,7 @@ SOC_ENUM("Right Capture Mode", rin_mode),
SOC_DOUBLE_R
(
"Capture Volume"
,
WM8904_ANALOGUE_LEFT_INPUT_0
,
WM8904_ANALOGUE_RIGHT_INPUT_0
,
0
,
31
,
0
),
SOC_DOUBLE_R
(
"Capture Switch"
,
WM8904_ANALOGUE_LEFT_INPUT_0
,
WM8904_ANALOGUE_RIGHT_INPUT_0
,
7
,
1
,
0
),
WM8904_ANALOGUE_RIGHT_INPUT_0
,
7
,
1
,
1
),
SOC_SINGLE
(
"High Pass Filter Switch"
,
WM8904_ADC_DIGITAL_0
,
4
,
1
,
0
),
SOC_ENUM
(
"High Pass Filter Mode"
,
hpf_mode
),
...
...
sound/soc/codecs/wm8940.c
浏览文件 @
6bcbf64a
...
...
@@ -621,7 +621,7 @@ static int wm8940_set_dai_clkdiv(struct snd_soc_dai *codec_dai,
switch
(
div_id
)
{
case
WM8940_BCLKDIV
:
reg
=
snd_soc_read
(
codec
,
WM8940_CLOCK
)
&
0xFFE
F
3
;
reg
=
snd_soc_read
(
codec
,
WM8940_CLOCK
)
&
0xFFE3
;
ret
=
snd_soc_write
(
codec
,
WM8940_CLOCK
,
reg
|
(
div
<<
2
));
break
;
case
WM8940_MCLKDIV
:
...
...
sound/soc/codecs/wm8962.c
浏览文件 @
6bcbf64a
...
...
@@ -1961,7 +1961,13 @@ static int wm8962_readable_register(struct snd_soc_codec *codec, unsigned int re
static
int
wm8962_reset
(
struct
snd_soc_codec
*
codec
)
{
return
snd_soc_write
(
codec
,
WM8962_SOFTWARE_RESET
,
0x6243
);
int
ret
;
ret
=
snd_soc_write
(
codec
,
WM8962_SOFTWARE_RESET
,
0x6243
);
if
(
ret
!=
0
)
return
ret
;
return
snd_soc_write
(
codec
,
WM8962_PLL_SOFTWARE_RESET
,
0
);
}
static
const
DECLARE_TLV_DB_SCALE
(
inpga_tlv
,
-
2325
,
75
,
0
);
...
...
@@ -2360,15 +2366,14 @@ static int sysclk_event(struct snd_soc_dapm_widget *w,
snd_soc_update_bits
(
codec
,
WM8962_FLL_CONTROL_1
,
WM8962_FLL_ENA
,
WM8962_FLL_ENA
);
if
(
wm8962
->
irq
)
{
timeout
=
msecs_to_jiffies
(
5
);
timeout
=
wait_for_completion_timeout
(
&
wm8962
->
fll_lock
,
timeout
);
if
(
timeout
==
0
)
dev_err
(
codec
->
dev
,
"Timed out starting FLL
\n
"
);
}
timeout
=
msecs_to_jiffies
(
5
);
timeout
=
wait_for_completion_timeout
(
&
wm8962
->
fll_lock
,
timeout
);
if
(
wm8962
->
irq
&&
timeout
==
0
)
dev_err
(
codec
->
dev
,
"Timed out starting FLL
\n
"
);
}
break
;
...
...
@@ -4029,6 +4034,11 @@ static int wm8962_probe(struct snd_soc_codec *codec)
snd_soc_update_bits
(
codec
,
WM8962_CLOCKING2
,
WM8962_CLKREG_OVD
,
WM8962_CLKREG_OVD
);
/* Ensure that the oscillator and PLLs are disabled */
snd_soc_update_bits
(
codec
,
WM8962_PLL2
,
WM8962_OSC_ENA
|
WM8962_PLL2_ENA
|
WM8962_PLL3_ENA
,
0
);
regulator_bulk_disable
(
ARRAY_SIZE
(
wm8962
->
supplies
),
wm8962
->
supplies
);
if
(
pdata
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录