forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'topic/tps6586x' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-hotplug

Browse source 
Conflicts:
	drivers/regulator/tps6586x-regulator.c
This commit is contained in:
Mark Brown 2012-11-20 10:39:55 +09:00
commit ce6dd5da9d
4 changed files with 165 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/linux/mfd/tps6586x.h
View file

@ -29,6 +29,7 @@ enum {
TPS6586X_ID_LDO_8,
TPS6586X_ID_LDO_9,
TPS6586X_ID_LDO_RTC,
TPS6586X_ID_MAX_REGULATOR,
};
enum {
@ -79,6 +80,8 @@ struct tps6586x_platform_data {
int gpio_base;
int irq_base;
bool pm_off;
struct regulator_init_data *reg_init_data[TPS6586X_ID_MAX_REGULATOR];
};
/*