diff options
| author | Robby Cai <r63905@freescale.com> | 2014-05-23 16:02:13 +0800 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2014-07-10 14:06:50 +0200 |
| commit | 7636793f90881036755c06c33cd7d8cf4078340f (patch) | |
| tree | 3bd6d993fe4934d8b991797f5304d827f28d9538 | |
| parent | 6b5ba243c21e60706806c4ea56124a0749b21c5b (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)
(cherry picked from commit dd27604b9d2a1bd294b3d8800e547bc526f87df7)
| -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 0de50d437c31..d8b9dd14d0b3 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, |