From: Loren HUANG <b02279@freescale.com>
Date: Tue, 29 Jan 2013 08:12:29 +0000 (+0800)
Subject: ENGR00242201-3 gpu: Makeup GPU driver for kernel 3.5.7
X-Git-Tag: v3.0.35-fsl~132
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9abe86a0414f87fb3321abbc5e84a4faaeffc062;p=karo-tx-linux.git

ENGR00242201-3 gpu: Makeup GPU driver for kernel 3.5.7

Signed-off-by: Loren HUANG <b02279@freescale.com>
Acked-by: Lily Zhang
---

diff --git a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
index 792dd96aac1c..af20f0baed1e 100644
--- a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
+++ b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
@@ -6801,12 +6801,11 @@ gckOS_SetGPUPower(
             case gcvCORE_MAJOR:
                 clk_prepare(clk_3dcore);
                 clk_enable(clk_3dcore);
-                /*if (cpu_is_mx6q())*/
-                    clk_prepare(clk_3dshader);
-                    clk_enable(clk_3dshader);
-                    clk_prepare(clk_3d_axi);
-                    clk_enable(clk_3d_axi);
-                    break;
+                clk_prepare(clk_3dshader);
+                clk_enable(clk_3dshader);
+                clk_prepare(clk_3d_axi);
+                clk_enable(clk_3d_axi);
+                break;
             case gcvCORE_2D:
                 clk_prepare(clk_2dcore);
                 clk_enable(clk_2dcore);
@@ -6827,9 +6826,8 @@ gckOS_SetGPUPower(
         if (oldClockState == gcvTRUE) {
             switch (Core) {
             case gcvCORE_MAJOR:
-                /*if (cpu_is_mx6q())*/
-                    clk_disable(clk_3dshader);
-                    clk_unprepare(clk_3dshader);
+                clk_disable(clk_3dshader);
+                clk_unprepare(clk_3dshader);
                 clk_disable(clk_3dcore);
                 clk_unprepare(clk_3dcore);
                 clk_disable(clk_3d_axi);