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
nexedi
linux
Commits
4e79f3f1
Commit
4e79f3f1
authored
Jan 26, 2018
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'regulator/topic/tps65218' into regulator-next
parents
cf1ba3bb
5597bfb4
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
drivers/regulator/tps65218-regulator.c
drivers/regulator/tps65218-regulator.c
+2
-3
No files found.
drivers/regulator/tps65218-regulator.c
View file @
4e79f3f1
...
@@ -28,9 +28,6 @@
...
@@ -28,9 +28,6 @@
#include <linux/regulator/machine.h>
#include <linux/regulator/machine.h>
#include <linux/mfd/tps65218.h>
#include <linux/mfd/tps65218.h>
enum
tps65218_regulators
{
DCDC1
,
DCDC2
,
DCDC3
,
DCDC4
,
DCDC5
,
DCDC6
,
LDO1
,
LS3
};
#define TPS65218_REGULATOR(_name, _of, _id, _type, _ops, _n, _vr, _vm, _er, \
#define TPS65218_REGULATOR(_name, _of, _id, _type, _ops, _n, _vr, _vm, _er, \
_em, _cr, _cm, _lr, _nlr, _delay, _fuv, _sr, _sm) \
_em, _cr, _cm, _lr, _nlr, _delay, _fuv, _sr, _sm) \
{ \
{ \
...
@@ -329,6 +326,8 @@ static int tps65218_regulator_probe(struct platform_device *pdev)
...
@@ -329,6 +326,8 @@ static int tps65218_regulator_probe(struct platform_device *pdev)
/* Allocate memory for strobes */
/* Allocate memory for strobes */
tps
->
strobes
=
devm_kzalloc
(
&
pdev
->
dev
,
sizeof
(
u8
)
*
tps
->
strobes
=
devm_kzalloc
(
&
pdev
->
dev
,
sizeof
(
u8
)
*
TPS65218_NUM_REGULATOR
,
GFP_KERNEL
);
TPS65218_NUM_REGULATOR
,
GFP_KERNEL
);
if
(
!
tps
->
strobes
)
return
-
ENOMEM
;
for
(
i
=
0
;
i
<
ARRAY_SIZE
(
regulators
);
i
++
)
{
for
(
i
=
0
;
i
<
ARRAY_SIZE
(
regulators
);
i
++
)
{
rdev
=
devm_regulator_register
(
&
pdev
->
dev
,
&
regulators
[
i
],
rdev
=
devm_regulator_register
(
&
pdev
->
dev
,
&
regulators
[
i
],
...
...
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