Ensure we initialise AB8505 external supply regulators.
Signed-off-by: Alexandre Torgue <[email protected]>
Signed-off-by: Lee Jones <[email protected]>
Reviewed-by: Philippe LANGLAIS <[email protected]>
Tested-by: Xiao Mei ZHANG <[email protected]>
---
drivers/regulator/ab8500-ext.c | 2 +-
drivers/regulator/ab8500.c | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/regulator/ab8500-ext.c b/drivers/regulator/ab8500-ext.c
index 993e9e4..412a9ac 100644
--- a/drivers/regulator/ab8500-ext.c
+++ b/drivers/regulator/ab8500-ext.c
@@ -419,7 +419,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)))
diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index 90f5263..be8351a 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -2841,6 +2841,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);
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
