From a45c44639237ed9a544c9b19fe7802e7e013639d Mon Sep 17 00:00:00 2001 From: yxj Date: Mon, 3 Sep 2012 17:43:09 +0800 Subject: [PATCH] rk3066B lcdc: add AXI_MS_ID config,fix stanby issue --- drivers/video/rockchip/chips/rk31_lcdc.c | 3 +++ drivers/video/rockchip/chips/rk31_lcdc.h | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/drivers/video/rockchip/chips/rk31_lcdc.c b/drivers/video/rockchip/chips/rk31_lcdc.c index 29dff742a256..d7bd62010137 100644 --- a/drivers/video/rockchip/chips/rk31_lcdc.c +++ b/drivers/video/rockchip/chips/rk31_lcdc.c @@ -76,6 +76,9 @@ static int init_rk31_lcdc(struct rk_lcdc_device_driver *dev_drv) LcdMskReg(lcdc_dev,SYS_CFG, m_LCDC_AXICLK_AUTO_ENABLE | m_W0_AXI_OUTSTANDING2 | m_W1_AXI_OUTSTANDING2,v_LCDC_AXICLK_AUTO_ENABLE(1) | v_W0_AXI_OUTSTANDING2(1) | v_W1_AXI_OUTSTANDING2(1));//eanble axi-clk auto gating for low power + LcdWrReg(lcdc_dev,AXI_MS_ID,v_HWC_CHANNEL_ID(5) | v_WIN2_CHANNEL_ID(4) | + v_WIN1_YRGB_CHANNEL_ID(3) | v_WIN0_CBR_CHANNEL_ID(2) | + v_WIN0_YRGB_CHANNEL_ID(1)); LcdMskReg(lcdc_dev, INT_STATUS,m_HOR_STARTMASK| m_FRM_STARTMASK | m_SCANNING_MASK, v_HOR_STARTMASK(1) | v_FRM_STARTMASK(1) | v_SCANNING_MASK(1)); //mask all interrupt in init diff --git a/drivers/video/rockchip/chips/rk31_lcdc.h b/drivers/video/rockchip/chips/rk31_lcdc.h index 25c6044d8688..c3abd092b04b 100644 --- a/drivers/video/rockchip/chips/rk31_lcdc.h +++ b/drivers/video/rockchip/chips/rk31_lcdc.h @@ -376,6 +376,17 @@ #define v_WIN2_FIFO_FULL_LEVEL(x) (((x)&0x1f) << 7) +#define m_WIN0_YRGB_CHANNEL_ID ((0x0f)<<0) +#define m_WIN0_CBR_CHANNEL_ID ((0x0f)<<4) +#define m_WIN1_YRGB_CHANNEL_ID ((0x0f)<<8) +#define m_WIN2_CHANNEL_ID ((0x0f)<<12) +#define m_HWC_CHANNEL_ID ((0x0f)<<16) +#define v_WIN0_YRGB_CHANNEL_ID(x) (((x)&0x0f)<<0) +#define v_WIN0_CBR_CHANNEL_ID(x) (((x)&0x0f)<<4) +#define v_WIN1_YRGB_CHANNEL_ID(x) (((x)&0x0f)<<8) +#define v_WIN2_CHANNEL_ID(x) (((x)&0x0f)<<12) +#define v_HWC_CHANNEL_ID(x) (((x)&0x0f)<<16) + //LCDC_WINx_SCL_FACTOR_Y/CBCR #define v_X_SCL_FACTOR(x) ((x)<<0) -- 2.34.1