projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d64a672
)
Revert "rk fb: fix dts name for vop big and vop little mmu name"
author
hjc
<hjc@rock-chips.com>
Wed, 30 Apr 2014 01:42:50 +0000
(09:42 +0800)
committer
hjc
<hjc@rock-chips.com>
Wed, 30 Apr 2014 01:43:16 +0000
(09:43 +0800)
This reverts commit
fc4c39bc30ebca57738fad47880fdb35c5ca1926
.
drivers/video/rockchip/rk_fb.c
patch
|
blob
|
history
diff --git
a/drivers/video/rockchip/rk_fb.c
b/drivers/video/rockchip/rk_fb.c
index 5d4d7ebf58f1a3b736a4d9890aa1933b251f4c80..d0cc4582400d0870957583e639ac71c26910e72b 100755
(executable)
--- a/
drivers/video/rockchip/rk_fb.c
+++ b/
drivers/video/rockchip/rk_fb.c
@@
-2889,7
+2889,7
@@
int rk_fb_register(struct rk_lcdc_driver *dev_drv,
fbi->pseudo_palette = dev_drv->win[i]->pseudo_pal;
if (i == 0){ /* only alloc memory for main fb*/
#ifdef CONFIG_ROCKCHIP_IOMMU
- mmu_dev = rockchip_get_sysmmu_device_by_compatible(
dev_drv->mmu_dts_name
);
+ mmu_dev = rockchip_get_sysmmu_device_by_compatible(
"iommu,vopl_mmu"
);
if (mmu_dev) {
platform_set_sysmmu(mmu_dev, dev_drv->dev);
rockchip_sysmmu_set_fault_handler(dev_drv->dev, rk_fb_sysmmu_fault_handler);