diff options
| author | Lee Jones <lee.jones@linaro.org> | 2013-04-02 13:24:10 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-02 23:01:43 +0100 |
| commit | bd44e2cb4a21d9297b84efbb2e26961f6ece0423 (patch) | |
| tree | b675e3cef384120edc110e3db500f0aaddd2f981 /drivers/regulator | |
| parent | 8a3b1b8703fed16c6b796e87c34e2bc0311fe305 (diff) | |
| download | linux-bd44e2cb4a21d9297b84efbb2e26961f6ece0423.tar.bz2 | |
regulator: ab8500: Also check for AB8505 based platforms
Ensure we initialise AB8505 external supply regulators.
Signed-off-by: Alexandre Torgue <alexandre.torgue@stericsson.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
Tested-by: Xiao Mei ZHANG <xiaomei.zhang@stericsson.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/ab8500-ext.c | 2 | ||||
| -rw-r--r-- | drivers/regulator/ab8500.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/regulator/ab8500-ext.c b/drivers/regulator/ab8500-ext.c index 1e92e0103380..c24372e96922 100644 --- a/drivers/regulator/ab8500-ext.c +++ b/drivers/regulator/ab8500-ext.c @@ -393,7 +393,7 @@ int ab8500_ext_regulator_init(struct platform_device *pdev) config.init_data = &pdata->ext_regulator[i]; config.driver_data = info; - if (is_ab9540(ab8500) && + if ((is_ab9540(ab8500) || is_ab8540(ab8500)) && ((info->desc.id == AB8500_EXT_SUPPLY1) || (info->desc.id == AB8500_EXT_SUPPLY2) || (info->desc.id == AB8500_EXT_SUPPLY3))) diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c index bf9139784670..e8d07f667448 100644 --- a/drivers/regulator/ab8500.c +++ b/drivers/regulator/ab8500.c @@ -2852,6 +2852,9 @@ static int ab8500_regulator_remove(struct platform_device *pdev) } else if (is_ab8505(ab8500)) { regulator_info = ab8505_regulator_info; regulator_info_size = ARRAY_SIZE(ab8505_regulator_info); + } else if (is_ab8540(ab8500)) { + regulator_info = ab8540_regulator_info; + regulator_info_size = ARRAY_SIZE(ab8540_regulator_info); } else { regulator_info = ab8500_regulator_info; regulator_info_size = ARRAY_SIZE(ab8500_regulator_info); |