git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'vhost' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
[pandora-kernel.git]
/
arch
/
arm
/
mach-mx3
/
clock-imx35.c
diff --git
a/arch/arm/mach-mx3/clock-imx35.c
b/arch/arm/mach-mx3/clock-imx35.c
index
f3f41fa
..
9f3e943
100644
(file)
--- a/
arch/arm/mach-mx3/clock-imx35.c
+++ b/
arch/arm/mach-mx3/clock-imx35.c
@@
-28,7
+28,7
@@
#include <mach/hardware.h>
#include <mach/common.h>
#include <mach/hardware.h>
#include <mach/common.h>
-#define CCM_BASE
IO_ADDRESS(
CCM_BASE_ADDR)
+#define CCM_BASE
MX35_IO_ADDRESS(MX35_
CCM_BASE_ADDR)
#define CCM_CCMR 0x00
#define CCM_PDR0 0x04
#define CCM_CCMR 0x00
#define CCM_PDR0 0x04
@@
-502,7
+502,8
@@
int __init mx35_clocks_init()
__raw_writel((3 << 26) | ll, CCM_BASE + CCM_CGR2);
__raw_writel(0, CCM_BASE + CCM_CGR3);
__raw_writel((3 << 26) | ll, CCM_BASE + CCM_CGR2);
__raw_writel(0, CCM_BASE + CCM_CGR3);
- mxc_timer_init(&gpt_clk, IO_ADDRESS(GPT1_BASE_ADDR), MXC_INT_GPT);
+ mxc_timer_init(&gpt_clk,
+ MX35_IO_ADDRESS(MX35_GPT1_BASE_ADDR), MX35_INT_GPT);
return 0;
}
return 0;
}