msm: kgsl: Add gcc_gpu_iref_clk to list of GPU clocks

GPU will vote off gcc_gpu_iref_clk when going to low power modes.

CRs-Fixed: 1024948
Change-Id: I13b7a70f1fa748f2f4cdfb485dda2f7857e0b3d2
Signed-off-by: Oleg Perelet <operelet@codeaurora.org>

diff --git a/Documentation/devicetree/bindings/gpu/adreno.txt b/Documentation/devicetree/bindings/gpu/adreno.txt
index dedf13c..5097e99 100644 (file)
--- a/Documentation/devicetree/bindings/gpu/adreno.txt
+++ b/Documentation/devicetree/bindings/gpu/adreno.txt
@@ -25,7 +25,8 @@ Required properties:
                        order as the clocks property.
                                Current values of clock-names are:
                                "src_clk", "core_clk", "iface_clk", "mem_clk", "mem_iface_clk",
-                               "alt_mem_iface_clk", "rbbmtimer_clk",  "alwayson_clk"
+                               "alt_mem_iface_clk", "rbbmtimer_clk",  "alwayson_clk",
+                               "iref_clk"
                                "core_clk" and "iface_clk" are required and others are optional
 
 - qcom,base-leakage-coefficient: Dynamic leakage coefficient.

diff --git a/arch/arm/boot/dts/qcom/msmcobalt-gpu.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-gpu.dtsi
index d8aca1e..7a12053 100644 (file)
--- a/arch/arm/boot/dts/qcom/msmcobalt-gpu.dtsi
+++ b/arch/arm/boot/dts/qcom/msmcobalt-gpu.dtsi
@@ -84,10 +84,12 @@
                        <&clock_gcc clk_gcc_bimc_gfx_clk>,
                        <&clock_gcc clk_gcc_gpu_bimc_gfx_clk>,
                        <&clock_gpu clk_gpucc_gfx3d_isense_clk>,
-                       <&clock_gpu clk_gpucc_rbcpr_clk>;
+                       <&clock_gpu clk_gpucc_rbcpr_clk>,
+                       <&clock_gcc clk_gcc_gpu_iref_clk>;
 
                clock-names = "core_clk", "iface_clk", "rbbmtimer_clk",
-                       "mem_clk", "mem_iface_clk", "isense_clk", "rbcpr_clk";
+                       "mem_clk", "mem_iface_clk", "isense_clk", "rbcpr_clk",
+                       "iref_clk";
 
                /* Bus Scale Settings */
                qcom,gpubw-dev = <&gpubw>;

diff --git a/drivers/gpu/msm/kgsl_pwrctrl.c b/drivers/gpu/msm/kgsl_pwrctrl.c
index 66d2021..830579d 100644 (file)
--- a/drivers/gpu/msm/kgsl_pwrctrl.c
+++ b/drivers/gpu/msm/kgsl_pwrctrl.c
@@ -64,7 +64,8 @@ static const char * const clocks[] = {
        "gtcu_iface_clk",
        "alwayson_clk",
        "isense_clk",
-       "rbcpr_clk"
+       "rbcpr_clk",
+       "iref_clk"
 };
 
 static unsigned int ib_votes[KGSL_MAX_BUSLEVELS];

diff --git a/drivers/gpu/msm/kgsl_pwrctrl.h b/drivers/gpu/msm/kgsl_pwrctrl.h
index 9fcea11..9d2c6ce 100644 (file)
--- a/drivers/gpu/msm/kgsl_pwrctrl.h
+++ b/drivers/gpu/msm/kgsl_pwrctrl.h
@@ -25,7 +25,7 @@
 
 #define KGSL_PWR_ON    0xFFFF
 
-#define KGSL_MAX_CLKS 13
+#define KGSL_MAX_CLKS 14
 #define KGSL_MAX_REGULATORS 2
 
 #define KGSL_MAX_PWRLEVELS 10