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
e60781b4
Commit
e60781b4
authored
Jul 09, 2014
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'regulator/fix/tps65218' into regulator-tps65218
parents
5f986f7c
42ab0f39
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
drivers/regulator/tps65218-regulator.c
drivers/regulator/tps65218-regulator.c
+3
-2
No files found.
drivers/regulator/tps65218-regulator.c
View file @
e60781b4
...
@@ -68,7 +68,7 @@ static const struct regulator_linear_range ldo1_dcdc3_ranges[] = {
...
@@ -68,7 +68,7 @@ static const struct regulator_linear_range ldo1_dcdc3_ranges[] = {
static
const
struct
regulator_linear_range
dcdc4_ranges
[]
=
{
static
const
struct
regulator_linear_range
dcdc4_ranges
[]
=
{
REGULATOR_LINEAR_RANGE
(
1175000
,
0x0
,
0xf
,
25000
),
REGULATOR_LINEAR_RANGE
(
1175000
,
0x0
,
0xf
,
25000
),
REGULATOR_LINEAR_RANGE
(
1
55
0000
,
0x10
,
0x34
,
50000
),
REGULATOR_LINEAR_RANGE
(
1
60
0000
,
0x10
,
0x34
,
50000
),
};
};
static
struct
tps_info
tps65218_pmic_regs
[]
=
{
static
struct
tps_info
tps65218_pmic_regs
[]
=
{
...
@@ -209,7 +209,7 @@ static const struct regulator_desc regulators[] = {
...
@@ -209,7 +209,7 @@ static const struct regulator_desc regulators[] = {
1
,
-
1
,
-
1
,
TPS65218_REG_ENABLE1
,
1
,
-
1
,
-
1
,
TPS65218_REG_ENABLE1
,
TPS65218_ENABLE1_DC6_EN
,
NULL
,
NULL
,
0
,
0
),
TPS65218_ENABLE1_DC6_EN
,
NULL
,
NULL
,
0
,
0
),
TPS65218_REGULATOR
(
"LDO1"
,
TPS65218_LDO_1
,
tps65218_ldo1_dcdc34_ops
,
64
,
TPS65218_REGULATOR
(
"LDO1"
,
TPS65218_LDO_1
,
tps65218_ldo1_dcdc34_ops
,
64
,
TPS65218_REG_CONTROL_
DCDC4
,
TPS65218_REG_CONTROL_
LDO1
,
TPS65218_CONTROL_LDO1_MASK
,
TPS65218_REG_ENABLE2
,
TPS65218_CONTROL_LDO1_MASK
,
TPS65218_REG_ENABLE2
,
TPS65218_ENABLE2_LDO1_EN
,
NULL
,
ldo1_dcdc3_ranges
,
TPS65218_ENABLE2_LDO1_EN
,
NULL
,
ldo1_dcdc3_ranges
,
2
,
0
),
2
,
0
),
...
@@ -240,6 +240,7 @@ static int tps65218_regulator_probe(struct platform_device *pdev)
...
@@ -240,6 +240,7 @@ static int tps65218_regulator_probe(struct platform_device *pdev)
config
.
init_data
=
init_data
;
config
.
init_data
=
init_data
;
config
.
driver_data
=
tps
;
config
.
driver_data
=
tps
;
config
.
regmap
=
tps
->
regmap
;
config
.
regmap
=
tps
->
regmap
;
config
.
of_node
=
pdev
->
dev
.
of_node
;
rdev
=
devm_regulator_register
(
&
pdev
->
dev
,
&
regulators
[
id
],
&
config
);
rdev
=
devm_regulator_register
(
&
pdev
->
dev
,
&
regulators
[
id
],
&
config
);
if
(
IS_ERR
(
rdev
))
{
if
(
IS_ERR
(
rdev
))
{
...
...
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