leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

video: ipuv3_fb: skip IPU shutdown if IPU was not enabled before

Browse Source 
Boards can skip display interface init using board_video_skip().
If display interface was not initialized (e.g. no ipuv3 framebuffer
registered or IPU clock disabled), booting Linux stops due to the
crash in IPU shutdown function, when accessing IPU registers.
Check IPU clock and skip shutdown if clock is not enabled.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
This commit is contained in:
Anatolij Gustschin 2017-08-25 15:10:43 +02:00
parent 22aa21dba4
commit 0d1ae97c02
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/video/mxc_ipuv3_fb.c
View File

@ -13,6 +13,7 @@
#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>
@ -568,8 +569,18 @@ err0:
void ipuv3_fb_shutdown(void)
{
int i;
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;
for (i = 0; i < ARRAY_SIZE(mxcfb_info); i++) {
struct fb_info *fbi = mxcfb_info[i];