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
ae5f5203
Commit
ae5f5203
authored
Apr 28, 2013
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'regulator/topic/palmas' into v3.9-rc8
parents
75f01f94
0ea34b57
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
316 additions
and
73 deletions
+316
-73
drivers/regulator/palmas-regulator.c
drivers/regulator/palmas-regulator.c
+305
-60
include/linux/mfd/palmas.h
include/linux/mfd/palmas.h
+11
-13
No files found.
drivers/regulator/palmas-regulator.c
View file @
ae5f5203
This diff is collapsed.
Click to expand it.
include/linux/mfd/palmas.h
View file @
ae5f5203
...
...
@@ -109,19 +109,6 @@ struct palmas_reg_init {
*/
int
mode_sleep
;
/* tstep is the timestep loaded to the TSTEP register
*
* For SMPS
*
* 0: Jump (no slope control)
* 1: 10mV/us
* 2: 5mV/us
* 3: 2.5mV/us
*
* For LDO unused
*/
int
tstep
;
/* voltage_sel is the bitfield loaded onto the SMPSX_VOLTAGE
* register. Set this is the default voltage set in OTP needs
* to be overridden.
...
...
@@ -154,6 +141,12 @@ enum palmas_regulators {
PALMAS_REG_LDO9
,
PALMAS_REG_LDOLN
,
PALMAS_REG_LDOUSB
,
/* External regulators */
PALMAS_REG_REGEN1
,
PALMAS_REG_REGEN2
,
PALMAS_REG_REGEN3
,
PALMAS_REG_SYSEN1
,
PALMAS_REG_SYSEN2
,
/* Total number of regulators */
PALMAS_NUM_REGS
,
};
...
...
@@ -171,6 +164,9 @@ struct palmas_pmic_platform_data {
/* use LDO6 for vibrator control */
int
ldo6_vibrator
;
/* Enable tracking mode of LDO8 */
bool
enable_ldo8_tracking
;
};
struct
palmas_usb_platform_data
{
...
...
@@ -331,6 +327,8 @@ struct palmas_pmic {
int
smps457
;
int
range
[
PALMAS_REG_SMPS10
];
unsigned
int
ramp_delay
[
PALMAS_REG_SMPS10
];
unsigned
int
current_reg_mode
[
PALMAS_REG_SMPS10
];
};
struct
palmas_resource
{
...
...
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