From bd44e2cb4a21d9297b84efbb2e26961f6ece0423 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Tue, 2 Apr 2013 13:24:10 +0100 Subject: [PATCH] regulator: ab8500: Also check for AB8505 based platforms Ensure we initialise AB8505 external supply regulators. Signed-off-by: Alexandre Torgue Signed-off-by: Lee Jones Reviewed-by: Philippe LANGLAIS Tested-by: Xiao Mei ZHANG Signed-off-by: Mark Brown --- 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 1e92e01..c24372e 100644 --- a/drivers/regulator/ab8500-ext.c +++ b/drivers/regulator/ab8500-ext.c @@ -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))) diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c index bf91397..e8d07f6 100644 --- a/drivers/regulator/ab8500.c +++ b/drivers/regulator/ab8500.c @@ -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); -- 2.7.4