Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd44e2cb authored Apr 02, 2013 by Lee Jones Committed by Mark Brown Apr 02, 2013

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>

parent 8a3b1b87

drivers/regulator/ab8500-ext.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)))

drivers/regulator/ab8500.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -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);