Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
c3fda066
K
Kernel
项目概览
openeuler
/
Kernel
大约 1 年 前同步成功
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
Kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c3fda066
编写于
11月 24, 2013
作者:
M
Mark Brown
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'regulator/fix/arizona' into regulator-linus
上级
6ce4eac1
d2e7491e
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
52 addition
and
2 deletion
+52
-2
drivers/regulator/arizona-micsupp.c
drivers/regulator/arizona-micsupp.c
+52
-2
未找到文件。
drivers/regulator/arizona-micsupp.c
浏览文件 @
c3fda066
...
@@ -174,6 +174,33 @@ static const struct regulator_desc arizona_micsupp = {
...
@@ -174,6 +174,33 @@ static const struct regulator_desc arizona_micsupp = {
.
owner
=
THIS_MODULE
,
.
owner
=
THIS_MODULE
,
};
};
static
const
struct
regulator_linear_range
arizona_micsupp_ext_ranges
[]
=
{
REGULATOR_LINEAR_RANGE
(
900000
,
0
,
0x14
,
25000
),
REGULATOR_LINEAR_RANGE
(
1500000
,
0x15
,
0x27
,
100000
),
};
static
const
struct
regulator_desc
arizona_micsupp_ext
=
{
.
name
=
"MICVDD"
,
.
supply_name
=
"CPVDD"
,
.
type
=
REGULATOR_VOLTAGE
,
.
n_voltages
=
40
,
.
ops
=
&
arizona_micsupp_ops
,
.
vsel_reg
=
ARIZONA_LDO2_CONTROL_1
,
.
vsel_mask
=
ARIZONA_LDO2_VSEL_MASK
,
.
enable_reg
=
ARIZONA_MIC_CHARGE_PUMP_1
,
.
enable_mask
=
ARIZONA_CPMIC_ENA
,
.
bypass_reg
=
ARIZONA_MIC_CHARGE_PUMP_1
,
.
bypass_mask
=
ARIZONA_CPMIC_BYPASS
,
.
linear_ranges
=
arizona_micsupp_ext_ranges
,
.
n_linear_ranges
=
ARRAY_SIZE
(
arizona_micsupp_ext_ranges
),
.
enable_time
=
3000
,
.
owner
=
THIS_MODULE
,
};
static
const
struct
regulator_init_data
arizona_micsupp_default
=
{
static
const
struct
regulator_init_data
arizona_micsupp_default
=
{
.
constraints
=
{
.
constraints
=
{
.
valid_ops_mask
=
REGULATOR_CHANGE_STATUS
|
.
valid_ops_mask
=
REGULATOR_CHANGE_STATUS
|
...
@@ -186,9 +213,22 @@ static const struct regulator_init_data arizona_micsupp_default = {
...
@@ -186,9 +213,22 @@ static const struct regulator_init_data arizona_micsupp_default = {
.
num_consumer_supplies
=
1
,
.
num_consumer_supplies
=
1
,
};
};
static
const
struct
regulator_init_data
arizona_micsupp_ext_default
=
{
.
constraints
=
{
.
valid_ops_mask
=
REGULATOR_CHANGE_STATUS
|
REGULATOR_CHANGE_VOLTAGE
|
REGULATOR_CHANGE_BYPASS
,
.
min_uV
=
900000
,
.
max_uV
=
3300000
,
},
.
num_consumer_supplies
=
1
,
};
static
int
arizona_micsupp_probe
(
struct
platform_device
*
pdev
)
static
int
arizona_micsupp_probe
(
struct
platform_device
*
pdev
)
{
{
struct
arizona
*
arizona
=
dev_get_drvdata
(
pdev
->
dev
.
parent
);
struct
arizona
*
arizona
=
dev_get_drvdata
(
pdev
->
dev
.
parent
);
const
struct
regulator_desc
*
desc
;
struct
regulator_config
config
=
{
};
struct
regulator_config
config
=
{
};
struct
arizona_micsupp
*
micsupp
;
struct
arizona_micsupp
*
micsupp
;
int
ret
;
int
ret
;
...
@@ -207,7 +247,17 @@ static int arizona_micsupp_probe(struct platform_device *pdev)
...
@@ -207,7 +247,17 @@ static int arizona_micsupp_probe(struct platform_device *pdev)
* default init_data for it. This will be overridden with
* default init_data for it. This will be overridden with
* platform data if provided.
* platform data if provided.
*/
*/
micsupp
->
init_data
=
arizona_micsupp_default
;
switch
(
arizona
->
type
)
{
case
WM5110
:
desc
=
&
arizona_micsupp_ext
;
micsupp
->
init_data
=
arizona_micsupp_ext_default
;
break
;
default:
desc
=
&
arizona_micsupp
;
micsupp
->
init_data
=
arizona_micsupp_default
;
break
;
}
micsupp
->
init_data
.
consumer_supplies
=
&
micsupp
->
supply
;
micsupp
->
init_data
.
consumer_supplies
=
&
micsupp
->
supply
;
micsupp
->
supply
.
supply
=
"MICVDD"
;
micsupp
->
supply
.
supply
=
"MICVDD"
;
micsupp
->
supply
.
dev_name
=
dev_name
(
arizona
->
dev
);
micsupp
->
supply
.
dev_name
=
dev_name
(
arizona
->
dev
);
...
@@ -226,7 +276,7 @@ static int arizona_micsupp_probe(struct platform_device *pdev)
...
@@ -226,7 +276,7 @@ static int arizona_micsupp_probe(struct platform_device *pdev)
ARIZONA_CPMIC_BYPASS
,
0
);
ARIZONA_CPMIC_BYPASS
,
0
);
micsupp
->
regulator
=
devm_regulator_register
(
&
pdev
->
dev
,
micsupp
->
regulator
=
devm_regulator_register
(
&
pdev
->
dev
,
&
arizona_micsupp
,
desc
,
&
config
);
&
config
);
if
(
IS_ERR
(
micsupp
->
regulator
))
{
if
(
IS_ERR
(
micsupp
->
regulator
))
{
ret
=
PTR_ERR
(
micsupp
->
regulator
);
ret
=
PTR_ERR
(
micsupp
->
regulator
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录