From d505de33afa463f7d6dd64e108be69cbc8d8f917 Mon Sep 17 00:00:00 2001 From: yxj Date: Thu, 29 Nov 2012 19:46:37 +0800 Subject: [PATCH] rk3066 lcdc:fix BLEND register define bug --- drivers/video/rockchip/lcdc/rk30_lcdc.h | 34 ++++++++++++------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/drivers/video/rockchip/lcdc/rk30_lcdc.h b/drivers/video/rockchip/lcdc/rk30_lcdc.h index 9576ed54c59a..01645ab021a7 100644 --- a/drivers/video/rockchip/lcdc/rk30_lcdc.h +++ b/drivers/video/rockchip/lcdc/rk30_lcdc.h @@ -304,23 +304,23 @@ typedef volatile struct tagLCDC_REG #define v_MCU_OUTPUT_SELECT(x) (((x)&1)<<31) //LCDC_ BLEND_CTRL -#define m_HWC_BLEND_EN (1<<0) -#define m_W2_BLEND_EN (1<<1) -#define m_W1_BLEND_EN (1<<2) -#define m_W0_BLEND_EN (1<<3) -#define m_HWC_BLEND_FACTOR (15<<4) -#define m_W2_BLEND_FACTOR (0xff<<8) -#define m_W1_BLEND_FACTOR (0xff<<16) -#define m_W0_BLEND_FACTOR (0xff<<24) - -#define v_HWC_BLEND_EN(x) (((x)&1)<<0) -#define v_W2_BLEND_EN(x) (((x)&1)<<1) -#define v_W1_BLEND_EN(x) (((x)&1)<<2) -#define v_W0_BLEND_EN(x) (((x)&1)<<3) -#define v_HWC_BLEND_FACTOR(x) (((x)&15)<<4) -#define v_W2_BLEND_FACTOR(x) (((x)&0xff)<<8) -#define v_W1_BLEND_FACTOR(x) (((x)&0xff)<<16) -#define v_W0_BLEND_FACTOR(x) (((x)&0xff)<<24) +#define m_W0_BLEND_EN (1<<0) +#define m_W1_BLEND_EN (1<<1) +#define m_W2_BLEND_EN (1<<2) +#define m_HWC_BLEND_EN (1<<3) +#define m_W0_BLEND_FACTOR (15<<4) +#define m_W1_BLEND_FACTOR (0xff<<8) +#define m_W2_BLEND_FACTOR (0xff<<16) +#define m_HWC_BLEND_FACTOR (0xff<<24) + +#define v_W0_BLEND_EN(x) (((x)&1)<<0) +#define v_W1_BLEND_EN(x) (((x)&1)<<1) +#define v_W2_BLEND_EN(x) (((x)&1)<<2) +#define v_HWC_BLEND_EN(x) (((x)&1)<<3) +#define v_W0_BLEND_FACTOR(x) (((x)&15)<<4) +#define v_W1_BLEND_FACTOR(x) (((x)&0xff)<<8) +#define v_W2_BLEND_FACTOR(x) (((x)&0xff)<<16) +#define v_HWC_BLEND_FACTOR(x) (((x)&0xff)<<24) //LCDC_WIN0_COLOR_KEY_CTRL / LCDC_WIN1_COLOR_KEY_CTRL -- 2.34.1