From dbfb1fe4ac308e910ff8095b76f28e69cc56c6b3 Mon Sep 17 00:00:00 2001 From: Jason Chen Date: Tue, 17 May 2011 13:13:15 +0800 Subject: [PATCH] ENGR00141552 ipuv3: fix display pin's power leak If you disable display, the display port's pin may keep high voltage which may cause power leakage. Fix this issue by make all pin go into low level after display disable. Signed-off-by: Jason Chen (cherry picked from commit 165df9e8d525082e70a165516e2bcd1d0529b148) --- drivers/mxc/ipu3/ipu_disp.c | 19 +++++++++++++++++++ drivers/video/mxc/mxc_ipuv3_fb.c | 1 + include/linux/ipu.h | 2 ++ 3 files changed, 22 insertions(+) diff --git a/drivers/mxc/ipu3/ipu_disp.c b/drivers/mxc/ipu3/ipu_disp.c index a4144cd3935..ac1db5a9517 100644 --- a/drivers/mxc/ipu3/ipu_disp.c +++ b/drivers/mxc/ipu3/ipu_disp.c @@ -1490,6 +1490,25 @@ int32_t ipu_init_sync_panel(int disp, uint32_t pixel_clk, } EXPORT_SYMBOL(ipu_init_sync_panel); +void ipu_uninit_sync_panel(int disp) +{ + unsigned long lock_flags; + uint32_t reg; + uint32_t di_gen; + + spin_lock_irqsave(&ipu_lock, lock_flags); + + di_gen = __raw_readl(DI_GENERAL(disp)); + di_gen |= 0x3ff | DI_GEN_POLARITY_DISP_CLK; + __raw_writel(di_gen, DI_GENERAL(disp)); + + reg = __raw_readl(DI_POL(disp)); + reg |= 0x3ffffff; + __raw_writel(reg, DI_POL(disp)); + + spin_unlock_irqrestore(&ipu_lock, lock_flags); +} +EXPORT_SYMBOL(ipu_uninit_sync_panel); int ipu_init_async_panel(int disp, int type, uint32_t cycle_time, uint32_t pixel_fmt, ipu_adc_sig_cfg_t sig) diff --git a/drivers/video/mxc/mxc_ipuv3_fb.c b/drivers/video/mxc/mxc_ipuv3_fb.c index 23ea6dd8916..fe453fa0272 100644 --- a/drivers/video/mxc/mxc_ipuv3_fb.c +++ b/drivers/video/mxc/mxc_ipuv3_fb.c @@ -1183,6 +1183,7 @@ static int mxcfb_blank(int blank, struct fb_info *info) case FB_BLANK_HSYNC_SUSPEND: case FB_BLANK_NORMAL: ipu_disable_channel(mxc_fbi->ipu_ch, true); + ipu_uninit_sync_panel(mxc_fbi->ipu_di); ipu_uninit_channel(mxc_fbi->ipu_ch); break; case FB_BLANK_UNBLANK: diff --git a/include/linux/ipu.h b/include/linux/ipu.h index 22dfdf6ba6a..39f4ef78906 100644 --- a/include/linux/ipu.h +++ b/include/linux/ipu.h @@ -956,6 +956,8 @@ int32_t ipu_init_sync_panel(int disp, uint16_t v_sync_width, uint16_t v_end_width, uint32_t v_to_h_sync, ipu_di_signal_cfg_t sig); +void ipu_uninit_sync_panel(int disp); + int32_t ipu_disp_set_window_pos(ipu_channel_t channel, int16_t x_pos, int16_t y_pos); int32_t ipu_disp_get_window_pos(ipu_channel_t channel, int16_t *x_pos,