diff options
| author | Robin Gong <b38343@freescale.com> | 2013-05-09 11:45:55 +0800 |
|---|---|---|
| committer | Xianzhong <b07117@freescale.com> | 2013-06-28 18:02:25 +0800 |
| commit | ac6e4ca689ce8d66cdb6a932216d29f107545544 (patch) | |
| tree | 1ff38e1b0495afbab6805d330ac4489762f5fdf0 /drivers/mxc/gpu-viv/hal/os/linux/kernel | |
| parent | 8a902ea2a0f24a534a52c41e288cd577560657db (diff) | |
ENGR00261814-4 gpu: use new PU power on/off interface
use new PU power on/off interface in GPU driver
Cherry-pick from 3.5.7 branch.
Signed-off-by: Robin Gong <b38343@freescale.com>
Acked-by: Lily Zhang
Diffstat (limited to 'drivers/mxc/gpu-viv/hal/os/linux/kernel')
| -rw-r--r-- | drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c | 16 |
1 files changed, 13 insertions, 3 deletions
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 f6e7eafdc1f2..88b317eddd80 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 @@ -6826,8 +6826,13 @@ gckOS_SetGPUPower( } if((Power == gcvTRUE) && (oldPowerState == gcvFALSE)) { - if(!IS_ERR(Os->device->gpu_regulator)) - regulator_enable(Os->device->gpu_regulator); +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0) + if(!IS_ERR(Os->device->gpu_regulator)) + regulator_enable(Os->device->gpu_regulator); +#else + imx_gpc_power_up_pu(true); +#endif + #ifdef CONFIG_PM pm_runtime_get_sync(Os->device->pmdev); #endif @@ -6937,8 +6942,13 @@ gckOS_SetGPUPower( #ifdef CONFIG_PM pm_runtime_put_sync(Os->device->pmdev); #endif + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0) if(!IS_ERR(Os->device->gpu_regulator)) - regulator_disable(Os->device->gpu_regulator); + regulator_disable(Os->device->gpu_regulator); +#else + imx_gpc_power_up_pu(false); +#endif } /* TODO: Put your code here. */ gcmkFOOTER_NO(); |