commit bd44e2cb4a21d9297b84efbb2e26961f6ece0423
author Lee Jones <lee.jones@linaro.org> Tue Apr 02 13:24:10 2013 +0100
committer Mark Brown <broonie@opensource.wolfsonmicro.com> Tue Apr 02 23:01:43 2013 +0100
tree b675e3cef384120edc110e3db500f0aaddd2f981
parent 8a3b1b8703fed16c6b796e87c34e2bc0311fe305

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>

drivers/regulator/ab8500-ext.c

diff --git a/drivers/regulator/ab8500-ext.c b/drivers/regulator/ab8500-ext.c
index 1e92e01..c24372e 100644
--- a/drivers/regulator/ab8500-ext.c
+++ b/drivers/regulator/ab8500-ext.c
@@ -393,7 +393,7 @@
 		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)))