Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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>
Lee Jones 12 years ago
parent
8a3b1b8703
commit
bd44e2cb4a
2 changed files with 4 additions and 1 deletions
Split View Show Diff Stats
  1. 1 1
      drivers/regulator/ab8500-ext.c
  2. 3 0
      drivers/regulator/ab8500.c

+ 1 - 1
drivers/regulator/ab8500-ext.c
View File 

@@ -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)))

+ 3 - 0
drivers/regulator/ab8500.c
View File 

@@ -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);