From: Rabin Vincent <rabin.vinc...@stericsson.com>
ExtSupply regulators are not included on AB8505 based platforms.
Signed-off-by: Rabin Vincent <rabin.vinc...@stericsson.com>
Signed-off-by: Lee Jones <lee.jo...@linaro.org>
Tested-by: Marcus COOPER <marcus.xm.coo...@stericsson.com>
---
drivers/regulator/ab8500.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index 1df809e..20c3270 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -2761,10 +2761,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++) {
@@ -2806,10 +2808,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);
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
