From beeb57f0a66658aacad3f12f1a31e65f5d22e46d Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 24 Nov 2019 17:37:52 -0300 Subject: [PATCH] Revert "video: mxsfb: Configure the clock after eLCDIF reset" Commit ec3dcea74470 ("video: mxsfb: Configure the clock after eLCDIF reset") causes boot regression on imx7d-pico/imx7d-sdb boards, so revert it until a better solution is prepared. This reverts commit ec3dcea7447031463643c33143b3a5f027f0b54d. Reported-by: Joris Offouga Signed-off-by: Fabio Estevam --- drivers/video/mxsfb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c index d73a8bac99..c52981053e 100644 --- a/drivers/video/mxsfb.c +++ b/drivers/video/mxsfb.c @@ -57,6 +57,9 @@ static void mxs_lcd_init(u32 fb_addr, struct ctfb_res_modes *mode, int bpp) uint32_t word_len = 0, bus_width = 0; uint8_t valid_data = 0; + /* Kick in the LCDIF clock */ + mxs_set_lcdclk(MXS_LCDIF_BASE, PS2KHZ(mode->pixclock)); + /* Restart the LCDIF block */ mxs_reset_block(®s->hw_lcdif_ctrl_reg); @@ -127,9 +130,6 @@ static void mxs_lcd_init(u32 fb_addr, struct ctfb_res_modes *mode, int bpp) /* FIFO cleared */ writel(LCDIF_CTRL1_FIFO_CLEAR, ®s->hw_lcdif_ctrl1_clr); - /* Kick in the LCDIF clock */ - mxs_set_lcdclk(MXS_LCDIF_BASE, PS2KHZ(mode->pixclock)); - /* RUN! */ writel(LCDIF_CTRL_RUN, ®s->hw_lcdif_ctrl_set); } -- 2.39.5