diff options
author | Robby Cai <r63905@freescale.com> | 2014-05-23 04:02:13 -0400 |
---|---|---|
committer | Robby Cai <r63905@freescale.com> | 2014-05-23 05:06:22 -0400 |
commit | a187b916d55052fed10de1797009250095b598fb (patch) | |
tree | 58af36fee128a4a111585043a4efa3171348d8ec | |
parent | 38fd110b550358057990d176c7ff27b45fde5939 (diff) |
ENGR00309838 ARM: imx6sl: gpc: add chip revision check for dispmix
The dispmix feature works without problem since TO1.2.
This patch adds the back-compatibility for older chip.
Signed-off-by: Robby Cai <r63905@freescale.com>
-rw-r--r-- | arch/arm/mach-imx/gpc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/gpc.c b/arch/arm/mach-imx/gpc.c index 18413c637c40..add59a7ad3ab 100644 --- a/arch/arm/mach-imx/gpc.c +++ b/arch/arm/mach-imx/gpc.c | |||
@@ -92,7 +92,8 @@ static void imx_disp_clk(bool enable) | |||
92 | 92 | ||
93 | static void imx_gpc_dispmix_on(void) | 93 | static void imx_gpc_dispmix_on(void) |
94 | { | 94 | { |
95 | if (cpu_is_imx6sl()) { | 95 | if (cpu_is_imx6sl() && |
96 | imx_get_soc_revision() >= IMX_CHIP_REVISION_1_2) { | ||
96 | imx_disp_clk(true); | 97 | imx_disp_clk(true); |
97 | 98 | ||
98 | writel_relaxed(0x0, gpc_base + GPC_PGC_DISP_PGCR_OFFSET); | 99 | writel_relaxed(0x0, gpc_base + GPC_PGC_DISP_PGCR_OFFSET); |
@@ -107,7 +108,8 @@ static void imx_gpc_dispmix_on(void) | |||
107 | 108 | ||
108 | static void imx_gpc_dispmix_off(void) | 109 | static void imx_gpc_dispmix_off(void) |
109 | { | 110 | { |
110 | if (cpu_is_imx6sl()) { | 111 | if (cpu_is_imx6sl() && |
112 | imx_get_soc_revision() >= IMX_CHIP_REVISION_1_2) { | ||
111 | imx_disp_clk(true); | 113 | imx_disp_clk(true); |
112 | 114 | ||
113 | writel_relaxed(0xFFFFFFFF, | 115 | writel_relaxed(0xFFFFFFFF, |