projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
video: rockchip: vop: 3399: update for CABC
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
video
/
rockchip
/
lcdc
/
rk322x_lcdc.c
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);
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);
if (IS_ERR(vop_dev->regs))
return PTR_ERR(vop_dev->regs);