Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gsplhtlxg
clone-Linux
提交
113620bb
C
clone-Linux
项目概览
gsplhtlxg
/
clone-Linux
通知
2
Star
0
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
clone-Linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
113620bb
编写于
1月 16, 2015
作者:
M
Mark Brown
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'regulator/fix/s2mps11' into regulator-linus
上级
d5613379
ad26aa6c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
40 addition
and
4 deletion
+40
-4
drivers/regulator/s2mps11.c
drivers/regulator/s2mps11.c
+38
-4
include/linux/mfd/samsung/s2mps13.h
include/linux/mfd/samsung/s2mps13.h
+2
-0
未找到文件。
drivers/regulator/s2mps11.c
浏览文件 @
113620bb
...
...
@@ -405,6 +405,40 @@ static struct regulator_ops s2mps14_reg_ops;
.enable_mask = S2MPS14_ENABLE_MASK \
}
#define regulator_desc_s2mps13_buck7(num, min, step, min_sel) { \
.name = "BUCK"#num, \
.id = S2MPS13_BUCK##num, \
.ops = &s2mps14_reg_ops, \
.type = REGULATOR_VOLTAGE, \
.owner = THIS_MODULE, \
.min_uV = min, \
.uV_step = step, \
.linear_min_sel = min_sel, \
.n_voltages = S2MPS14_BUCK_N_VOLTAGES, \
.ramp_delay = S2MPS13_BUCK_RAMP_DELAY, \
.vsel_reg = S2MPS13_REG_B1OUT + (num) * 2 - 1, \
.vsel_mask = S2MPS14_BUCK_VSEL_MASK, \
.enable_reg = S2MPS13_REG_B1CTRL + (num - 1) * 2, \
.enable_mask = S2MPS14_ENABLE_MASK \
}
#define regulator_desc_s2mps13_buck8_10(num, min, step, min_sel) { \
.name = "BUCK"#num, \
.id = S2MPS13_BUCK##num, \
.ops = &s2mps14_reg_ops, \
.type = REGULATOR_VOLTAGE, \
.owner = THIS_MODULE, \
.min_uV = min, \
.uV_step = step, \
.linear_min_sel = min_sel, \
.n_voltages = S2MPS14_BUCK_N_VOLTAGES, \
.ramp_delay = S2MPS13_BUCK_RAMP_DELAY, \
.vsel_reg = S2MPS13_REG_B1OUT + (num) * 2 - 1, \
.vsel_mask = S2MPS14_BUCK_VSEL_MASK, \
.enable_reg = S2MPS13_REG_B1CTRL + (num) * 2 - 1, \
.enable_mask = S2MPS14_ENABLE_MASK \
}
static
const
struct
regulator_desc
s2mps13_regulators
[]
=
{
regulator_desc_s2mps13_ldo
(
1
,
MIN_800_MV
,
STEP_12_5_MV
,
0x00
),
regulator_desc_s2mps13_ldo
(
2
,
MIN_1400_MV
,
STEP_50_MV
,
0x0C
),
...
...
@@ -452,10 +486,10 @@ static const struct regulator_desc s2mps13_regulators[] = {
regulator_desc_s2mps13_buck
(
4
,
MIN_500_MV
,
STEP_6_25_MV
,
0x10
),
regulator_desc_s2mps13_buck
(
5
,
MIN_500_MV
,
STEP_6_25_MV
,
0x10
),
regulator_desc_s2mps13_buck
(
6
,
MIN_500_MV
,
STEP_6_25_MV
,
0x10
),
regulator_desc_s2mps13_buck
(
7
,
MIN_500_MV
,
STEP_6_25_MV
,
0x10
),
regulator_desc_s2mps13_buck
(
8
,
MIN_1000_MV
,
STEP_12_5_MV
,
0x20
),
regulator_desc_s2mps13_buck
(
9
,
MIN_1000_MV
,
STEP_12_5_MV
,
0x20
),
regulator_desc_s2mps13_buck
(
10
,
MIN_500_MV
,
STEP_6_25_MV
,
0x10
),
regulator_desc_s2mps13_buck
7
(
7
,
MIN_500_MV
,
STEP_6_25_MV
,
0x10
),
regulator_desc_s2mps13_buck
8_10
(
8
,
MIN_1000_MV
,
STEP_12_5_MV
,
0x20
),
regulator_desc_s2mps13_buck
8_10
(
9
,
MIN_1000_MV
,
STEP_12_5_MV
,
0x20
),
regulator_desc_s2mps13_buck
8_10
(
10
,
MIN_500_MV
,
STEP_6_25_MV
,
0x10
),
};
static
int
s2mps14_regulator_enable
(
struct
regulator_dev
*
rdev
)
...
...
include/linux/mfd/samsung/s2mps13.h
浏览文件 @
113620bb
...
...
@@ -59,6 +59,7 @@ enum s2mps13_reg {
S2MPS13_REG_B6CTRL
,
S2MPS13_REG_B6OUT
,
S2MPS13_REG_B7CTRL
,
S2MPS13_REG_B7SW
,
S2MPS13_REG_B7OUT
,
S2MPS13_REG_B8CTRL
,
S2MPS13_REG_B8OUT
,
...
...
@@ -102,6 +103,7 @@ enum s2mps13_reg {
S2MPS13_REG_L26CTRL
,
S2MPS13_REG_L27CTRL
,
S2MPS13_REG_L28CTRL
,
S2MPS13_REG_L29CTRL
,
S2MPS13_REG_L30CTRL
,
S2MPS13_REG_L31CTRL
,
S2MPS13_REG_L32CTRL
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录