diff options
| author | Tom Rini <trini@konsulko.com> | 2017-09-01 16:17:17 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-09-01 16:17:17 -0400 |
| commit | 9493d05a4156cddac3d257fea9e33c877d4bb10b (patch) | |
| tree | 2be2fb458d713d8b894eeddbb6da82023e60e38b /drivers/video | |
| parent | 0b6e5b2c48f91afec21870502761e27961ac061c (diff) | |
Revert "Merge git://git.denx.de/u-boot-video"
This reverts commit 1d20170467b079642be96996dcd71db64c3c365c, reversing
changes made to 6aee2ab68c362ace5a59f89a63abed82e0bf19e5.
The mxc_ipuv3_fb.c changes introduce build failures on some targets.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/mxc_ipuv3_fb.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/video/mxc_ipuv3_fb.c b/drivers/video/mxc_ipuv3_fb.c index 88362290ef..0d0a0a97ff 100644 --- a/drivers/video/mxc_ipuv3_fb.c +++ b/drivers/video/mxc_ipuv3_fb.c @@ -13,7 +13,6 @@ #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,18 +568,8 @@ 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; - - /* - * 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) - return; + struct ipu_stat *stat = (struct ipu_stat *)IPU_STAT; for (i = 0; i < ARRAY_SIZE(mxcfb_info); i++) { struct fb_info *fbi = mxcfb_info[i]; |