diff options
author | Eric Miao <eric.miao@linaro.org> | 2012-01-14 20:46:38 +0800 |
---|---|---|
committer | Eric Miao <eric.miao@linaro.org> | 2012-01-14 20:46:38 +0800 |
commit | ba31f9bc45d0a96ca50b69feb341d10dc13bee25 (patch) | |
tree | a1f874131ca888a7f6600e8c86e031385f903aca | |
parent | 810de279f4eedf874b725371999b96033a7156ab (diff) | |
parent | 766b224ba0781a69591b297fa685d781f856be2f (diff) |
Merge branch 'topic/lt-3.2-imx6-misc' into lt-3.2-imx6
* topic/lt-3.2-imx6-misc:
imx6q: fix I/O mapping address/size of mxs_viim.c
-rw-r--r-- | arch/arm/boot/dts/imx6q.dtsi | 4 | ||||
-rw-r--r-- | drivers/char/mxs_viim.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi index 09f0becd197..51b3965a1c1 100644 --- a/arch/arm/boot/dts/imx6q.dtsi +++ b/arch/arm/boot/dts/imx6q.dtsi @@ -544,8 +544,8 @@ viim@021bc000 { compatible = "fsl,imx6q-viim"; - reg = <0x021bc000 0x4000>, - <0x021c0000 0x4000>; + reg = <0x02098000 0x4000>, + <0x021bc000 0x4000>; interrupts = <0 21 0x04>; }; diff --git a/drivers/char/mxs_viim.c b/drivers/char/mxs_viim.c index ae04b0bd8cc..4faa5bf9e18 100644 --- a/drivers/char/mxs_viim.c +++ b/drivers/char/mxs_viim.c @@ -47,7 +47,7 @@ static int mxs_viim_mmap(struct file *file, struct vm_area_struct *vma) if (remap_pfn_range(vma, vma->vm_start, iim_reg_base0 >> PAGE_SHIFT, - iim_reg_size0, + size, vma->vm_page_prot)) return -EAGAIN; |