aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Miao <eric.miao@linaro.org>2012-01-14 20:20:14 +0800
committerEric Miao <eric.miao@linaro.org>2012-01-14 20:20:18 +0800
commit766b224ba0781a69591b297fa685d781f856be2f (patch)
tree8d1db17d463f5c7e445f2699492f077ce36bce11
parent0aea43bf004cabab7548668106bfe1376288a68c (diff)
downloadlinux-linaro-topic/lt-3.2-imx6-misc.tar.gz
imx6q: fix I/O mapping address/size of mxs_viim.ctopic/lt-3.2-imx6-misc
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 <eric.miao@linaro.org>
-rw-r--r--arch/arm/boot/dts/imx6q.dtsi4
-rw-r--r--drivers/char/mxs_viim.c2
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;