diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2011-05-11 14:35:30 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:15:16 +0200 |
| commit | f9c39340dd1bcf02e967bcd8ee825f35691a3211 (patch) | |
| tree | 200f2e8e015751bb1c8668f710398fa428d99ebe /include/linux | |
| parent | 5ae0bb5e0a044d132332820f2d6efc2339dd2ef3 (diff) | |
U5500 : Update of ab5500 plaftorm data structure
Bring back AB5500 initial data setting structure in petra platform
data.Required by CG2900 chip driver
ST-Ericsson Linux next: NA
ST-Ericsson ID: 257121
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I7626d10611a32ea18619e47f21ed7a53016592be
Signed-off-by: Bibek Basu <bibek.basu@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/22763
Reviewed-by: Lukasz RYMANOWSKI <lukasz.rymanowski@stericsson.com>
Reviewed-by: QATOOLS
Reviewed-by: QATEST
Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
Conflicts:
drivers/mfd/ab5500-core.c
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mfd/abx500/ab5500.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/mfd/abx500/ab5500.h b/include/linux/mfd/abx500/ab5500.h index 1b2b150072a..58db5206fa9 100644 --- a/include/linux/mfd/abx500/ab5500.h +++ b/include/linux/mfd/abx500/ab5500.h @@ -134,9 +134,11 @@ struct ab5500 { struct ab5500_regulator_platform_data; struct ab5500_platform_data { struct {unsigned int base; unsigned int count; } irq; - bool pm_power_off; void *dev_data[AB5500_NUM_DEVICES]; size_t dev_data_sz[AB5500_NUM_DEVICES]; + struct abx500_init_settings *init_settings; + unsigned int init_settings_sz; + bool pm_power_off; struct ab5500_regulator_platform_data *regulator; }; |