diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 12:42:53 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 12:42:53 +0900 |
| commit | db58e0270ce36fbcee22147405e1917ce01880ae (patch) | |
| tree | 2ca2e35f8e8391b8eed32f55ec79ce09251ad3b3 /include | |
| parent | 4e62cce2b62d5bdb10790e6cf0893b84dae84de8 (diff) | |
| parent | f509fd46c164524d06a33b01a64f9bd2033e4825 (diff) | |
Merge remote-tracking branch 'regulator/topic/da9055' into regulator-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mfd/da9055/pdata.h | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/include/linux/mfd/da9055/pdata.h b/include/linux/mfd/da9055/pdata.h index 147293b4471..f87a6c172a9 100644 --- a/include/linux/mfd/da9055/pdata.h +++ b/include/linux/mfd/da9055/pdata.h @@ -25,8 +25,29 @@ struct da9055_pdata { int gpio_base; struct regulator_init_data *regulators[DA9055_MAX_REGULATORS]; - bool reset_enable; /* Enable RTC in RESET Mode */ - enum gpio_select *gpio_rsel; /* Select regulator set thru GPIO 1/2 */ - enum gpio_select *gpio_ren; /* Enable regulator thru GPIO 1/2 */ + /* Enable RTC in RESET Mode */ + bool reset_enable; + /* + * GPI muxed pin to control + * regulator state A/B, 0 if not available. + */ + int *gpio_ren; + /* + * GPI muxed pin to control + * regulator set, 0 if not available. + */ + int *gpio_rsel; + /* + * Regulator mode control bits value (GPI offset) that + * that controls the regulator state, 0 if not available. + */ + enum gpio_select *reg_ren; + /* + * Regulator mode control bits value (GPI offset) that + * controls the regulator set A/B, 0 if not available. + */ + enum gpio_select *reg_rsel; + /* GPIOs to enable regulator, 0 if not available */ + int *ena_gpio; }; #endif /* __DA9055_PDATA_H */ |