Revert "MALI: midgard: support sharing regulator with other devices"

This reverts commit 85b4e1dffa2e7a0bbd092d294043f19f82417d74.

Change-Id: Ie8fb980cb8a8b063dd6c9626d5b6c858b36f0976
Signed-off-by: chenzhen <chenzhen@rock-chips.com>

diff --git a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c
index 083810f853ae050b6949de966a685c3e95f4641b..fd3c1f58a7d409b35da10c8195802476d74376ff 100644 (file)
--- a/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c
+++ b/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c
@@ -76,7 +76,7 @@ kbase_devfreq_target(struct device *dev, unsigned long *target_freq, u32 flags)
 #ifdef CONFIG_REGULATOR
                if (kbdev->current_voltage == voltage)
                        return 0;
-               err = regulator_set_voltage(kbdev->regulator, voltage, INT_MAX);
+               err = regulator_set_voltage(kbdev->regulator, voltage, voltage);
                if (err) {
                        dev_err(dev, "Failed to set voltage (%d)\n", err);
                        return err;
@@ -89,7 +89,7 @@ kbase_devfreq_target(struct device *dev, unsigned long *target_freq, u32 flags)
 #ifdef CONFIG_REGULATOR
        if (kbdev->regulator && kbdev->current_voltage != voltage &&
            old_freq < freq) {
-               err = regulator_set_voltage(kbdev->regulator, voltage, INT_MAX);
+               err = regulator_set_voltage(kbdev->regulator, voltage, voltage);
                if (err) {
                        dev_err(dev, "Failed to increase voltage (%d)\n", err);
                        return err;
@@ -113,7 +113,7 @@ kbase_devfreq_target(struct device *dev, unsigned long *target_freq, u32 flags)
 #ifdef CONFIG_REGULATOR
        if (kbdev->regulator && kbdev->current_voltage != voltage &&
            old_freq > freq) {
-               err = regulator_set_voltage(kbdev->regulator, voltage, INT_MAX);
+               err = regulator_set_voltage(kbdev->regulator, voltage, voltage);
                if (err) {
                        dev_err(dev, "Failed to decrease voltage (%d)\n", err);
                        return err;