Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
5cbad7d3
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看板
提交
5cbad7d3
编写于
4月 12, 2013
作者:
M
Mark Brown
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-next
上级
3c307826
da445afe
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
63 addition
and
16 deletion
+63
-16
include/linux/mfd/wm8994/pdata.h
include/linux/mfd/wm8994/pdata.h
+8
-0
sound/soc/codecs/wm8994.c
sound/soc/codecs/wm8994.c
+54
-14
sound/soc/codecs/wm8994.h
sound/soc/codecs/wm8994.h
+1
-2
未找到文件。
include/linux/mfd/wm8994/pdata.h
浏览文件 @
5cbad7d3
...
...
@@ -17,6 +17,7 @@
#define WM8994_NUM_LDO 2
#define WM8994_NUM_GPIO 11
#define WM8994_NUM_AIF 3
struct
wm8994_ldo_pdata
{
/** GPIOs to enable regulator, 0 or less if not available */
...
...
@@ -215,6 +216,13 @@ struct wm8994_pdata {
* system.
*/
bool
spkmode_pu
;
/**
* Maximum number of channels clocks will be generated for,
* useful for systems where and I2S bus with multiple data
* lines is mastered.
*/
int
max_channels_clocked
[
WM8994_NUM_AIF
];
};
#endif
sound/soc/codecs/wm8994.c
浏览文件 @
5cbad7d3
...
...
@@ -2209,7 +2209,7 @@ static int _wm8994_set_fll(struct snd_soc_codec *codec, int id, int src,
vmid_reference
(
codec
);
break
;
case
WM8958
:
if
(
wm8994
->
revision
<
1
)
if
(
control
->
revision
<
1
)
vmid_reference
(
codec
);
break
;
default:
...
...
@@ -2244,7 +2244,7 @@ static int _wm8994_set_fll(struct snd_soc_codec *codec, int id, int src,
vmid_dereference
(
codec
);
break
;
case
WM8958
:
if
(
wm8994
->
revision
<
1
)
if
(
control
->
revision
<
1
)
vmid_dereference
(
codec
);
break
;
default:
...
...
@@ -2268,10 +2268,26 @@ static int _wm8994_set_fll(struct snd_soc_codec *codec, int id, int src,
*/
if
(
max
(
wm8994
->
aifclk
[
0
],
wm8994
->
aifclk
[
1
])
<
50000
)
{
dev_dbg
(
codec
->
dev
,
"Configuring AIFs for 128fs
\n
"
);
wm8994
->
aifdiv
[
0
]
=
snd_soc_read
(
codec
,
WM8994_AIF1_RATE
)
&
WM8994_AIF1CLK_RATE_MASK
;
wm8994
->
aifdiv
[
1
]
=
snd_soc_read
(
codec
,
WM8994_AIF2_RATE
)
&
WM8994_AIF1CLK_RATE_MASK
;
snd_soc_update_bits
(
codec
,
WM8994_AIF1_RATE
,
WM8994_AIF1CLK_RATE_MASK
,
0x1
);
snd_soc_update_bits
(
codec
,
WM8994_AIF2_RATE
,
WM8994_AIF2CLK_RATE_MASK
,
0x1
);
}
else
if
(
wm8994
->
aifdiv
[
0
])
{
snd_soc_update_bits
(
codec
,
WM8994_AIF1_RATE
,
WM8994_AIF1CLK_RATE_MASK
,
wm8994
->
aifdiv
[
0
]);
snd_soc_update_bits
(
codec
,
WM8994_AIF2_RATE
,
WM8994_AIF2CLK_RATE_MASK
,
wm8994
->
aifdiv
[
1
]);
wm8994
->
aifdiv
[
0
]
=
0
;
wm8994
->
aifdiv
[
1
]
=
0
;
}
return
0
;
...
...
@@ -2368,10 +2384,26 @@ static int wm8994_set_dai_sysclk(struct snd_soc_dai *dai,
*/
if
(
max
(
wm8994
->
aifclk
[
0
],
wm8994
->
aifclk
[
1
])
<
50000
)
{
dev_dbg
(
codec
->
dev
,
"Configuring AIFs for 128fs
\n
"
);
wm8994
->
aifdiv
[
0
]
=
snd_soc_read
(
codec
,
WM8994_AIF1_RATE
)
&
WM8994_AIF1CLK_RATE_MASK
;
wm8994
->
aifdiv
[
1
]
=
snd_soc_read
(
codec
,
WM8994_AIF2_RATE
)
&
WM8994_AIF1CLK_RATE_MASK
;
snd_soc_update_bits
(
codec
,
WM8994_AIF1_RATE
,
WM8994_AIF1CLK_RATE_MASK
,
0x1
);
snd_soc_update_bits
(
codec
,
WM8994_AIF2_RATE
,
WM8994_AIF2CLK_RATE_MASK
,
0x1
);
}
else
if
(
wm8994
->
aifdiv
[
0
])
{
snd_soc_update_bits
(
codec
,
WM8994_AIF1_RATE
,
WM8994_AIF1CLK_RATE_MASK
,
wm8994
->
aifdiv
[
0
]);
snd_soc_update_bits
(
codec
,
WM8994_AIF2_RATE
,
WM8994_AIF2CLK_RATE_MASK
,
wm8994
->
aifdiv
[
1
]);
wm8994
->
aifdiv
[
0
]
=
0
;
wm8994
->
aifdiv
[
1
]
=
0
;
}
return
0
;
...
...
@@ -2411,7 +2443,7 @@ static int wm8994_set_bias_level(struct snd_soc_codec *codec,
if
(
codec
->
dapm
.
bias_level
==
SND_SOC_BIAS_OFF
)
{
switch
(
control
->
type
)
{
case
WM8958
:
if
(
wm8994
->
revision
==
0
)
{
if
(
control
->
revision
==
0
)
{
/* Optimise performance for rev A */
snd_soc_update_bits
(
codec
,
WM8958_CHARGE_PUMP_2
,
...
...
@@ -2656,6 +2688,8 @@ static int wm8994_hw_params(struct snd_pcm_substream *substream,
{
struct
snd_soc_codec
*
codec
=
dai
->
codec
;
struct
wm8994_priv
*
wm8994
=
snd_soc_codec_get_drvdata
(
codec
);
struct
wm8994
*
control
=
wm8994
->
wm8994
;
struct
wm8994_pdata
*
pdata
=
&
control
->
pdata
;
int
aif1_reg
;
int
aif2_reg
;
int
bclk_reg
;
...
...
@@ -2723,7 +2757,14 @@ static int wm8994_hw_params(struct snd_pcm_substream *substream,
}
wm8994
->
channels
[
id
]
=
params_channels
(
params
);
switch
(
params_channels
(
params
))
{
if
(
pdata
->
max_channels_clocked
[
id
]
&&
wm8994
->
channels
[
id
]
>
pdata
->
max_channels_clocked
[
id
])
{
dev_dbg
(
dai
->
dev
,
"Constraining channels to %d from %d
\n
"
,
pdata
->
max_channels_clocked
[
id
],
wm8994
->
channels
[
id
]);
wm8994
->
channels
[
id
]
=
pdata
->
max_channels_clocked
[
id
];
}
switch
(
wm8994
->
channels
[
id
])
{
case
1
:
case
2
:
bclk_rate
*=
2
;
...
...
@@ -2745,7 +2786,7 @@ static int wm8994_hw_params(struct snd_pcm_substream *substream,
dev_dbg
(
dai
->
dev
,
"AIF%dCLK is %dHz, target BCLK %dHz
\n
"
,
dai
->
id
,
wm8994
->
aifclk
[
id
],
bclk_rate
);
if
(
params_channels
(
params
)
==
1
&&
if
(
wm8994
->
channels
[
id
]
==
1
&&
(
snd_soc_read
(
codec
,
aif1_reg
)
&
0x18
)
==
0x18
)
aif2
|=
WM8994_AIF1_MONO
;
...
...
@@ -3053,7 +3094,7 @@ static int wm8994_codec_resume(struct snd_soc_codec *codec)
int
i
,
ret
;
unsigned
int
val
,
mask
;
if
(
wm8994
->
revision
<
4
)
{
if
(
control
->
revision
<
4
)
{
/* force a HW read */
ret
=
regmap_read
(
control
->
regmap
,
WM8994_POWER_MANAGEMENT_5
,
&
val
);
...
...
@@ -3870,7 +3911,6 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
codec
->
dapm
.
idle_bias_off
=
1
;
/* Set revision-specific configuration */
wm8994
->
revision
=
snd_soc_read
(
codec
,
WM8994_CHIP_REVISION
);
switch
(
control
->
type
)
{
case
WM8994
:
/* Single ended line outputs should have VMID on. */
...
...
@@ -3878,7 +3918,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
!
control
->
pdata
.
lineout2_diff
)
codec
->
dapm
.
idle_bias_off
=
0
;
switch
(
wm8994
->
revision
)
{
switch
(
control
->
revision
)
{
case
2
:
case
3
:
wm8994
->
hubs
.
dcs_codes_l
=
-
5
;
...
...
@@ -3897,7 +3937,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
wm8994
->
hubs
.
dcs_readback_mode
=
1
;
wm8994
->
hubs
.
hp_startup_mode
=
1
;
switch
(
wm8994
->
revision
)
{
switch
(
control
->
revision
)
{
case
0
:
break
;
default:
...
...
@@ -4000,7 +4040,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
switch
(
control
->
type
)
{
case
WM1811
:
if
(
control
->
cust_id
>
1
||
wm8994
->
revision
>
1
)
{
if
(
control
->
cust_id
>
1
||
control
->
revision
>
1
)
{
ret
=
wm8994_request_irq
(
wm8994
->
wm8994
,
WM8994_IRQ_GPIO
(
6
),
wm1811_jackdet_irq
,
"JACKDET"
,
...
...
@@ -4114,7 +4154,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
case
WM8994
:
snd_soc_dapm_new_controls
(
dapm
,
wm8994_specific_dapm_widgets
,
ARRAY_SIZE
(
wm8994_specific_dapm_widgets
));
if
(
wm8994
->
revision
<
4
)
{
if
(
control
->
revision
<
4
)
{
snd_soc_dapm_new_controls
(
dapm
,
wm8994_lateclk_revd_widgets
,
ARRAY_SIZE
(
wm8994_lateclk_revd_widgets
));
snd_soc_dapm_new_controls
(
dapm
,
wm8994_adc_revd_widgets
,
...
...
@@ -4135,7 +4175,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
ARRAY_SIZE
(
wm8958_snd_controls
));
snd_soc_dapm_new_controls
(
dapm
,
wm8958_dapm_widgets
,
ARRAY_SIZE
(
wm8958_dapm_widgets
));
if
(
wm8994
->
revision
<
1
)
{
if
(
control
->
revision
<
1
)
{
snd_soc_dapm_new_controls
(
dapm
,
wm8994_lateclk_revd_widgets
,
ARRAY_SIZE
(
wm8994_lateclk_revd_widgets
));
snd_soc_dapm_new_controls
(
dapm
,
wm8994_adc_revd_widgets
,
...
...
@@ -4174,7 +4214,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
snd_soc_dapm_add_routes
(
dapm
,
wm8994_intercon
,
ARRAY_SIZE
(
wm8994_intercon
));
if
(
wm8994
->
revision
<
4
)
{
if
(
control
->
revision
<
4
)
{
snd_soc_dapm_add_routes
(
dapm
,
wm8994_revd_intercon
,
ARRAY_SIZE
(
wm8994_revd_intercon
));
snd_soc_dapm_add_routes
(
dapm
,
wm8994_lateclk_revd_intercon
,
...
...
@@ -4185,7 +4225,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
}
break
;
case
WM8958
:
if
(
wm8994
->
revision
<
1
)
{
if
(
control
->
revision
<
1
)
{
snd_soc_dapm_add_routes
(
dapm
,
wm8994_intercon
,
ARRAY_SIZE
(
wm8994_intercon
));
snd_soc_dapm_add_routes
(
dapm
,
wm8994_revd_intercon
,
...
...
sound/soc/codecs/wm8994.h
浏览文件 @
5cbad7d3
...
...
@@ -79,6 +79,7 @@ struct wm8994_priv {
int
sysclk_rate
[
2
];
int
mclk
[
2
];
int
aifclk
[
2
];
int
aifdiv
[
2
];
int
channels
[
2
];
struct
wm8994_fll_config
fll
[
2
],
fll_suspend
[
2
];
struct
completion
fll_locked
[
2
];
...
...
@@ -146,8 +147,6 @@ struct wm8994_priv {
wm1811_mic_id_cb
mic_id_cb
;
void
*
mic_id_cb_data
;
int
revision
;
unsigned
int
aif1clk_enable
:
1
;
unsigned
int
aif2clk_enable
:
1
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录