From 766b224ba0781a69591b297fa685d781f856be2f Mon Sep 17 00:00:00 2001 From: Eric Miao Date: Sat, 14 Jan 2012 20:20:14 +0800 Subject: imx6q: fix I/O mapping address/size of mxs_viim.c BugLink: http://bugs.launchpad.net/bugs/916469 The memory mapping in mxs_viim.c is incorrect with the mapping size, and mxs_viim.c is using GPT as the first iim mapping. Signed-off-by: Eric Miao --- arch/arm/boot/dts/imx6q.dtsi | 4 ++-- 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 72b5ca0375b..e149a6df596 100644 --- a/arch/arm/boot/dts/imx6q.dtsi +++ b/arch/arm/boot/dts/imx6q.dtsi @@ -516,8 +516,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; -- cgit v1.2.3