Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
c1b07892
Commit
c1b07892
authored
Dec 12, 2016
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'regulator/fix/axp20x' into regulator-linus
parents
69973b83
618c8089
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
2 deletions
+10
-2
drivers/regulator/axp20x-regulator.c
drivers/regulator/axp20x-regulator.c
+10
-2
No files found.
drivers/regulator/axp20x-regulator.c
View file @
c1b07892
...
@@ -337,10 +337,18 @@ static const struct regulator_desc axp809_regulators[] = {
...
@@ -337,10 +337,18 @@ static const struct regulator_desc axp809_regulators[] = {
AXP22X_ELDO2_V_OUT
,
0x1f
,
AXP22X_PWR_OUT_CTRL2
,
BIT
(
1
)),
AXP22X_ELDO2_V_OUT
,
0x1f
,
AXP22X_PWR_OUT_CTRL2
,
BIT
(
1
)),
AXP_DESC
(
AXP809
,
ELDO3
,
"eldo3"
,
"eldoin"
,
700
,
3300
,
100
,
AXP_DESC
(
AXP809
,
ELDO3
,
"eldo3"
,
"eldoin"
,
700
,
3300
,
100
,
AXP22X_ELDO3_V_OUT
,
0x1f
,
AXP22X_PWR_OUT_CTRL2
,
BIT
(
2
)),
AXP22X_ELDO3_V_OUT
,
0x1f
,
AXP22X_PWR_OUT_CTRL2
,
BIT
(
2
)),
AXP_DESC_IO
(
AXP809
,
LDO_IO0
,
"ldo_io0"
,
"ips"
,
700
,
3300
,
100
,
/*
* Note the datasheet only guarantees reliable operation up to
* 3.3V, this needs to be enforced via dts provided constraints
*/
AXP_DESC_IO
(
AXP809
,
LDO_IO0
,
"ldo_io0"
,
"ips"
,
700
,
3800
,
100
,
AXP22X_LDO_IO0_V_OUT
,
0x1f
,
AXP20X_GPIO0_CTRL
,
0x07
,
AXP22X_LDO_IO0_V_OUT
,
0x1f
,
AXP20X_GPIO0_CTRL
,
0x07
,
AXP22X_IO_ENABLED
,
AXP22X_IO_DISABLED
),
AXP22X_IO_ENABLED
,
AXP22X_IO_DISABLED
),
AXP_DESC_IO
(
AXP809
,
LDO_IO1
,
"ldo_io1"
,
"ips"
,
700
,
3300
,
100
,
/*
* Note the datasheet only guarantees reliable operation up to
* 3.3V, this needs to be enforced via dts provided constraints
*/
AXP_DESC_IO
(
AXP809
,
LDO_IO1
,
"ldo_io1"
,
"ips"
,
700
,
3800
,
100
,
AXP22X_LDO_IO1_V_OUT
,
0x1f
,
AXP20X_GPIO1_CTRL
,
0x07
,
AXP22X_LDO_IO1_V_OUT
,
0x1f
,
AXP20X_GPIO1_CTRL
,
0x07
,
AXP22X_IO_ENABLED
,
AXP22X_IO_DISABLED
),
AXP22X_IO_ENABLED
,
AXP22X_IO_DISABLED
),
AXP_DESC_FIXED
(
AXP809
,
RTC_LDO
,
"rtc_ldo"
,
"ips"
,
1800
),
AXP_DESC_FIXED
(
AXP809
,
RTC_LDO
,
"rtc_ldo"
,
"ips"
,
1800
),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment