diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-19 20:39:55 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-19 20:39:55 -0500 |
| commit | ce6dd5da9dfcf9232df09d8d486cd6ed25e29cdc (patch) | |
| tree | 5ab56a65bd6b52ae690b16d395c4d15599f43c7c /include/linux/mfd | |
| parent | a5023574d120ca3b9337cedd4e27de90cae9aff7 (diff) | |
| parent | 64e481603ab46bcd1466fdaffca50f25bf123f83 (diff) | |
Merge branch 'topic/tps6586x' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-hotplug
Conflicts:
drivers/regulator/tps6586x-regulator.c
Diffstat (limited to 'include/linux/mfd')
| -rw-r--r-- | include/linux/mfd/tps6586x.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/mfd/tps6586x.h b/include/linux/mfd/tps6586x.h index 2dd123194958..f8da0e152567 100644 --- a/include/linux/mfd/tps6586x.h +++ b/include/linux/mfd/tps6586x.h | |||
| @@ -29,6 +29,7 @@ enum { | |||
| 29 | TPS6586X_ID_LDO_8, | 29 | TPS6586X_ID_LDO_8, |
| 30 | TPS6586X_ID_LDO_9, | 30 | TPS6586X_ID_LDO_9, |
| 31 | TPS6586X_ID_LDO_RTC, | 31 | TPS6586X_ID_LDO_RTC, |
| 32 | TPS6586X_ID_MAX_REGULATOR, | ||
| 32 | }; | 33 | }; |
| 33 | 34 | ||
| 34 | enum { | 35 | enum { |
| @@ -79,6 +80,8 @@ struct tps6586x_platform_data { | |||
| 79 | int gpio_base; | 80 | int gpio_base; |
| 80 | int irq_base; | 81 | int irq_base; |
| 81 | bool pm_off; | 82 | bool pm_off; |
| 83 | |||
| 84 | struct regulator_init_data *reg_init_data[TPS6586X_ID_MAX_REGULATOR]; | ||
| 82 | }; | 85 | }; |
| 83 | 86 | ||
| 84 | /* | 87 | /* |