diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-20 01:39:55 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-20 01:39:55 (GMT) |
| commit | ce6dd5da9dfcf9232df09d8d486cd6ed25e29cdc (patch) | |
| tree | 5ab56a65bd6b52ae690b16d395c4d15599f43c7c /include/linux/mfd | |
| parent | a5023574d120ca3b9337cedd4e27de90cae9aff7 (diff) | |
| parent | 64e481603ab46bcd1466fdaffca50f25bf123f83 (diff) | |
| download | linux-fsl-qoriq-ce6dd5da9dfcf9232df09d8d486cd6ed25e29cdc.tar.xz | |
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 2dd1231..f8da0e1 100644 --- a/include/linux/mfd/tps6586x.h +++ b/include/linux/mfd/tps6586x.h @@ -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]; }; /* |