video: rockchip: vop: 3399: update for CABC

Change-Id: I6e93d0e8daedf8a1c671ebbc28719da0296083da
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>

diff --git a/drivers/video/rockchip/lcdc/rk322x_lcdc.c b/drivers/video/rockchip/lcdc/rk322x_lcdc.c
index de1fba61133fbc47ad54cd9a06ec7ce2551a2b54..9e321afce5ad18d289e564eb616b367b5f3b8cc9 100644 (file)
--- a/drivers/video/rockchip/lcdc/rk322x_lcdc.c
+++ b/drivers/video/rockchip/lcdc/rk322x_lcdc.c
@@ -4813,7 +4813,8 @@ static int vop_probe(struct platform_device *pdev)
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        vop_dev->reg_phy_base = res->start;
        vop_dev->len = resource_size(res);
-       vop_dev->regs = devm_ioremap_resource(dev, res);
+       vop_dev->regs = devm_ioremap(&pdev->dev, res->start,
+                                    resource_size(res));
        if (IS_ERR(vop_dev->regs))
                return PTR_ERR(vop_dev->regs);
 

diff --git a/drivers/video/rockchip/lcdc/rk322x_lcdc.h b/drivers/video/rockchip/lcdc/rk322x_lcdc.h
index 6db168b425cadcf2f49aca1242e20ebf099c8738..ac7d98045095ec191208afbed8ecee20a4d3fb35 100644 (file)
--- a/drivers/video/rockchip/lcdc/rk322x_lcdc.h
+++ b/drivers/video/rockchip/lcdc/rk322x_lcdc.h
@@ -866,8 +866,8 @@ static inline u64 val_mask(int val, u64 msk, int shift)
 #define  V_BCSH_R2Y_CSC_MODE(x)                        VAL_MASK(x, 1, 6)
 #define CABC_CTRL0                     0x000001c0
 #define  V_CABC_EN(x)                          VAL_MASK(x, 1, 0)
-#define  V_PWM_CONFIG_MODE(x)                  VAL_MASK(x, 2, 1)
-#define  V_CABC_HANDLE_EN(x)                   VAL_MASK(x, 1, 3)
+#define  V_CABC_HANDLE_EN(x)                   VAL_MASK(x, 1, 1)
+#define  V_PWM_CONFIG_MODE(x)                  VAL_MASK(x, 2, 2)
 #define  V_CABC_CALC_PIXEL_NUM(x)              VAL_MASK(x, 23, 4)
 #define CABC_CTRL1                     0x000001c4
 #define  V_CABC_LUT_EN(x)                      VAL_MASK(x, 1, 0)