mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 07:04:24 +00:00
Code Issues Releases Wiki Activity

regulator: ab8500: Don't register external regulators on AB8505

Browse source 
ExtSupply regulators are not included on AB8505 based platforms.

Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Tested-by: Marcus COOPER <marcus.xm.cooper@stericsson.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Rabin Vincent 2013-04-02 13:24:08 +01:00 committed by Mark Brown
parent 0b94641126
commit f7eae37fcc
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/regulator/ab8500.c
View file

@ -2777,10 +2777,12 @@ static int ab8500_regulator_probe(struct platform_device *pdev)
return err;
}
/* register external regulators (before Vaux1, 2 and 3) */
err = ab8500_ext_regulator_init(pdev);
if (err)
return err;
if (!is_ab8505(ab8500)) {
/* register external regulators (before Vaux1, 2 and 3) */
err = ab8500_ext_regulator_init(pdev);
if (err)
return err;
}
/* register all regulators */
for (i = 0; i < regulator_info_size; i++) {
@ -2822,10 +2824,12 @@ static int ab8500_regulator_remove(struct platform_device *pdev)
regulator_unregister(info->regulator);
}
/* remove external regulators (after Vaux1, 2 and 3) */
err = ab8500_ext_regulator_exit(pdev);
if (err)
return err;
if (!is_ab8505(ab8500)) {
/* remove external regulators (after Vaux1, 2 and 3) */
err = ab8500_ext_regulator_exit(pdev);
if (err)
return err;
}
/* remove regulator debug */
err = ab8500_regulator_debug_exit(pdev);