diff options
| author | Robby Cai <r63905@freescale.com> | 2014-05-23 16:02:13 +0800 |
|---|---|---|
| committer | Robby Cai <r63905@freescale.com> | 2014-05-23 19:02:45 +0800 |
| commit | dd27604b9d2a1bd294b3d8800e547bc526f87df7 (patch) | |
| tree | 66dfe6f55eed3f6ac8a86dae1b2911180dd2ff6c | |
| parent | 232293e0abb46639e188ab9d8643f1dbf94534f6 (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>
(cherry picked from commit a187b916d55052fed10de1797009250095b598fb)
| -rw-r--r-- | arch/arm/mach-imx/gpc.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/gpc.c b/arch/arm/mach-imx/gpc.c index 97343277d1e8..25e987cd2337 100644 --- a/arch/arm/mach-imx/gpc.c +++ b/arch/arm/mach-imx/gpc.c @@ -1,5 +1,5 @@ /* - * Copyright 2011-2013 Freescale Semiconductor, Inc. + * Copyright 2011-2014 Freescale Semiconductor, Inc. * Copyright 2011 Linaro Ltd. * * The code contained herein is licensed under the GNU General Public @@ -90,7 +90,8 @@ static void imx_disp_clk(bool enable) static void imx_gpc_dispmix_on(void) { - if (cpu_is_imx6sl()) { + if (cpu_is_imx6sl() && + imx_get_soc_revision() >= IMX_CHIP_REVISION_1_2) { imx_disp_clk(true); writel_relaxed(0x0, gpc_base + GPC_PGC_DISP_PGCR_OFFSET); @@ -105,7 +106,8 @@ static void imx_gpc_dispmix_on(void) static void imx_gpc_dispmix_off(void) { - if (cpu_is_imx6sl()) { + if (cpu_is_imx6sl() && + imx_get_soc_revision() >= IMX_CHIP_REVISION_1_2) { imx_disp_clk(true); writel_relaxed(0xFFFFFFFF, |