CHROMIUM: MALI: Don't hardcode that there are 2 regulators
Most of the code in power_control_init() uses "kbdev->regulator_num"
to find out the number of regulators. ...except for one place where
it was hardcoded to 2. Let's fix that.
See CL:1317240 for where the code was originally added.
BUG=chromium:941638
TEST=Boot up and use GPU on veyron
Change-Id: Ifce149d475351c87b2cb1d7505936299a736f09a
Fixes: d12dc1a83564 ("CHROMIUM: MALI: Add Mali platform specific source")
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1539803
Reviewed-by: Dominik Behr <dbehr@chromium.org>
Reviewed-by: Pi-Hsun Shih <pihsun@chromium.org>
Reviewed-by: Nicolas Boichat <drinkcat@chromium.org>
diff --git a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
index 0a3535b..b581c74 100644
--- a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
+++ b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
@@ -3195,7 +3195,8 @@
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)) \
|| defined(LSK_OPPV2_BACKPORT)
#if defined(CONFIG_REGULATOR)
- kbdev->dev_opp_table = dev_pm_opp_set_regulators(kbdev->dev, reg_names, 2);
+ kbdev->dev_opp_table = dev_pm_opp_set_regulators(kbdev->dev, reg_names,
+ kbdev->regulator_num);
if (IS_ERR(kbdev->dev_opp_table)) {
err = PTR_ERR(kbdev->dev_opp_table);
kbdev->dev_opp_table = NULL;
