aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-mxc
diff options
context:
space:
mode:
authorJason Wang <jason77.wang@gmail.com>2010-08-21 16:24:03 +0800
committerSascha Hauer <s.hauer@pengutronix.de>2010-08-21 12:22:43 +0200
commita38b372fc2a3d8fe7ddbeab94d4c8bcb721f2403 (patch)
treec2be7a26cc22f3adc6f1a1c117e8dead2d388d5c /arch/arm/plat-mxc
parentclock-imx35: Calculate the base clock rate for the IPU unit (diff)
downloadlinux-dev-a38b372fc2a3d8fe7ddbeab94d4c8bcb721f2403.tar.xz
linux-dev-a38b372fc2a3d8fe7ddbeab94d4c8bcb721f2403.zip
mxc/tzic: add base address when accessing TZIC registers
When we call tzic_enable_wake function, the kernel will crash because of access to an unmapped address. This is because two register access operations forgot to add base address. Signed-off-by: Jason Wang <jason77.wang@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc')
-rw-r--r--arch/arm/plat-mxc/tzic.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/tzic.c b/arch/arm/plat-mxc/tzic.c
index b3da9aad4295..3703ab28257f 100644
--- a/arch/arm/plat-mxc/tzic.c
+++ b/arch/arm/plat-mxc/tzic.c
@@ -164,8 +164,9 @@ int tzic_enable_wake(int is_idle)
return -EAGAIN;
for (i = 0; i < 4; i++) {
- v = is_idle ? __raw_readl(TZIC_ENSET0(i)) : wakeup_intr[i];
- __raw_writel(v, TZIC_WAKEUP0(i));
+ v = is_idle ? __raw_readl(tzic_base + TZIC_ENSET0(i)) :
+ wakeup_intr[i];
+ __raw_writel(v, tzic_base + TZIC_WAKEUP0(i));
}
return 0;