summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTushar Behera <tushar.behera@linaro.org>2012-09-06 17:00:59 +0530
committerTushar Behera <tushar.behera@linaro.org>2012-09-06 17:24:33 +0530
commit17aae4d68b7cdbfe0f9fd2d6abfcdb9d97ca389a (patch)
treed73c39c2d55418546c7c1e7b3d5256f49f1725bd
parent33a8cb9fbdcf3972dd254c54a34256ac002d0eca (diff)
ARM: EXYNOS: Set G3D power domain to be always onsamsung-lt-v3.4-2
MALI driver requires that the G3D power domain is always on, hence removed power_off hook from G3D power domain node. Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
-rw-r--r--arch/arm/mach-exynos/pm_domains.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/mach-exynos/pm_domains.c b/arch/arm/mach-exynos/pm_domains.c
index 5a74dccd8494..20e279a44340 100644
--- a/arch/arm/mach-exynos/pm_domains.c
+++ b/arch/arm/mach-exynos/pm_domains.c
@@ -146,7 +146,6 @@ static struct exynos_pm_domain *exynos4_pm_domains[] = {
static __init int exynos4_pm_init_power_domain(void)
{
int idx;
- struct generic_pm_domain *p;
if (of_have_populated_dt())
return exynos_pm_dt_parse_domains();
@@ -187,14 +186,9 @@ static __init int exynos4_pm_init_power_domain(void)
exynos_pm_add_dev_to_genpd(&s5p_device_g2d, &exynos4_pd_lcd0);
#endif
#ifdef CONFIG_S5P_DEV_G3D
+ /* MALI requires the PD to be always on. */
+ exynos4_pd_g3d.pd.power_off = NULL;
exynos_pm_add_dev_to_genpd(&s5p_device_g3d, &exynos4_pd_g3d);
-
- p = pd_to_genpd(s5p_device_g3d.dev.pm_domain);
-
- /* This is flag not to call power_off callback */
- /* pm_genpd_dev_always_on doesn't work with Mali */
-
- p->status = GPD_STATE_WAIT_MASTER;
#endif
#ifdef CONFIG_S5P_DEV_JPEG
exynos_pm_add_dev_to_genpd(&s5p_device_jpeg, &exynos4_pd_cam);