Merge tag 'signed-efi-2018.07' of git://github.com/agraf/u-boot

[u-boot] / drivers / video / mxc_ipuv3_fb.c

diff --git a/drivers/video/mxc_ipuv3_fb.c b/drivers/video/mxc_ipuv3_fb.c
index 88362290ef90db248e53003232ae728befe4085f..23cd55de47967a487e76383cf2c3f3faf3eabac4 100644 (file)
--- a/drivers/video/mxc_ipuv3_fb.c
+++ b/drivers/video/mxc_ipuv3_fb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Porting to u-boot:
  *
@@ -7,13 +8,10 @@
  * MX51 Linux framebuffer:
  *
  * (C) Copyright 2004-2010 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <linux/errno.h>
-#include <asm/arch/crm_regs.h>
 #include <asm/global_data.h>
 #include <linux/string.h>
 #include <linux/list.h>
@@ -569,17 +567,10 @@ err0:
 
 void ipuv3_fb_shutdown(void)
 {
-       struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
-       struct ipu_stat *stat = (struct ipu_stat *)IPU_STAT;
-       u32 reg;
        int i;
+       struct ipu_stat *stat = (struct ipu_stat *)IPU_STAT;
 
-       /*
-        * Check if IPU clock was enabled before. Won't access
-        * IPU registers if clock is not enabled.
-        */
-       reg = readl(&mxc_ccm->CCGR3);
-       if ((reg & MXC_CCM_CCGR3_IPU1_IPU_MASK) == 0)
+       if (!ipu_clk_enabled())
                return;
 
        for (i = 0; i < ARRAY_SIZE(mxcfb_info); i++) {