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
1401990e
Commit
1401990e
authored
9 years ago
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branches 'regulator/fix/doc' and 'regulator/fix/palmas' into regulator-linus
parents
bc465aa9
cf39284d
e03826d5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
1 deletion
+8
-1
drivers/regulator/palmas-regulator.c
drivers/regulator/palmas-regulator.c
+4
-0
include/linux/mfd/palmas.h
include/linux/mfd/palmas.h
+3
-0
include/linux/regulator/driver.h
include/linux/regulator/driver.h
+1
-1
No files found.
drivers/regulator/palmas-regulator.c
View file @
1401990e
...
...
@@ -1572,6 +1572,10 @@ static int palmas_regulators_probe(struct platform_device *pdev)
if
(
!
pmic
)
return
-
ENOMEM
;
if
(
of_device_is_compatible
(
node
,
"ti,tps659038-pmic"
))
palmas_generic_regs_info
[
PALMAS_REG_REGEN2
].
ctrl_addr
=
TPS659038_REGEN2_CTRL
;
pmic
->
dev
=
&
pdev
->
dev
;
pmic
->
palmas
=
palmas
;
palmas
->
pmic
=
pmic
;
...
...
This diff is collapsed.
Click to expand it.
include/linux/mfd/palmas.h
View file @
1401990e
...
...
@@ -2999,6 +2999,9 @@ enum usb_irq_events {
#define PALMAS_GPADC_TRIM15 0x0E
#define PALMAS_GPADC_TRIM16 0x0F
/* TPS659038 regen2_ctrl offset iss different from palmas */
#define TPS659038_REGEN2_CTRL 0x12
/* TPS65917 Interrupt registers */
/* Registers for function INTERRUPT */
...
...
This diff is collapsed.
Click to expand it.
include/linux/regulator/driver.h
View file @
1401990e
...
...
@@ -316,7 +316,7 @@ struct regulator_desc {
* @driver_data: private regulator data
* @of_node: OpenFirmware node to parse for device tree bindings (may be
* NULL).
* @regmap: regmap to use for core regmap helpers if dev_get_reg
ulator
() is
* @regmap: regmap to use for core regmap helpers if dev_get_reg
map
() is
* insufficient.
* @ena_gpio_initialized: GPIO controlling regulator enable was properly
* initialized, meaning that >= 0 is a valid gpio
...
...
This diff is collapsed.
Click to expand it.
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