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
00581b30
Commit
00581b30
authored
Jun 27, 2012
by
Mark Brown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
regulator: wm8994: Set enable_time in descriptor
Signed-off-by:
Mark Brown
<
broonie@opensource.wolfsonmicro.com
>
parent
3d0f267f
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
9 deletions
+2
-9
drivers/regulator/wm8994-regulator.c
drivers/regulator/wm8994-regulator.c
+2
-9
No files found.
drivers/regulator/wm8994-regulator.c
View file @
00581b30
...
@@ -70,18 +70,10 @@ static int wm8994_ldo_is_enabled(struct regulator_dev *rdev)
...
@@ -70,18 +70,10 @@ static int wm8994_ldo_is_enabled(struct regulator_dev *rdev)
return
ldo
->
is_enabled
;
return
ldo
->
is_enabled
;
}
}
static
int
wm8994_ldo_enable_time
(
struct
regulator_dev
*
rdev
)
{
/* 3ms is fairly conservative but this shouldn't be too performance
* critical; can be tweaked per-system if required. */
return
3000
;
}
static
struct
regulator_ops
wm8994_ldo1_ops
=
{
static
struct
regulator_ops
wm8994_ldo1_ops
=
{
.
enable
=
wm8994_ldo_enable
,
.
enable
=
wm8994_ldo_enable
,
.
disable
=
wm8994_ldo_disable
,
.
disable
=
wm8994_ldo_disable
,
.
is_enabled
=
wm8994_ldo_is_enabled
,
.
is_enabled
=
wm8994_ldo_is_enabled
,
.
enable_time
=
wm8994_ldo_enable_time
,
.
list_voltage
=
regulator_list_voltage_linear
,
.
list_voltage
=
regulator_list_voltage_linear
,
.
map_voltage
=
regulator_map_voltage_linear
,
.
map_voltage
=
regulator_map_voltage_linear
,
...
@@ -119,7 +111,6 @@ static struct regulator_ops wm8994_ldo2_ops = {
...
@@ -119,7 +111,6 @@ static struct regulator_ops wm8994_ldo2_ops = {
.
enable
=
wm8994_ldo_enable
,
.
enable
=
wm8994_ldo_enable
,
.
disable
=
wm8994_ldo_disable
,
.
disable
=
wm8994_ldo_disable
,
.
is_enabled
=
wm8994_ldo_is_enabled
,
.
is_enabled
=
wm8994_ldo_is_enabled
,
.
enable_time
=
wm8994_ldo_enable_time
,
.
list_voltage
=
wm8994_ldo2_list_voltage
,
.
list_voltage
=
wm8994_ldo2_list_voltage
,
.
get_voltage_sel
=
regulator_get_voltage_sel_regmap
,
.
get_voltage_sel
=
regulator_get_voltage_sel_regmap
,
...
@@ -137,6 +128,7 @@ static const struct regulator_desc wm8994_ldo_desc[] = {
...
@@ -137,6 +128,7 @@ static const struct regulator_desc wm8994_ldo_desc[] = {
.
ops
=
&
wm8994_ldo1_ops
,
.
ops
=
&
wm8994_ldo1_ops
,
.
min_uV
=
2400000
,
.
min_uV
=
2400000
,
.
uV_step
=
100000
,
.
uV_step
=
100000
,
.
enable_time
=
3000
,
.
owner
=
THIS_MODULE
,
.
owner
=
THIS_MODULE
,
},
},
{
{
...
@@ -147,6 +139,7 @@ static const struct regulator_desc wm8994_ldo_desc[] = {
...
@@ -147,6 +139,7 @@ static const struct regulator_desc wm8994_ldo_desc[] = {
.
vsel_reg
=
WM8994_LDO_2
,
.
vsel_reg
=
WM8994_LDO_2
,
.
vsel_mask
=
WM8994_LDO2_VSEL_MASK
,
.
vsel_mask
=
WM8994_LDO2_VSEL_MASK
,
.
ops
=
&
wm8994_ldo2_ops
,
.
ops
=
&
wm8994_ldo2_ops
,
.
enable_time
=
3000
,
.
owner
=
THIS_MODULE
,
.
owner
=
THIS_MODULE
,
},
},
};
};
...
...
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