aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/mm-imx3.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-04-03 06:42:27 -0400
committerSascha Hauer <s.hauer@pengutronix.de>2012-04-25 11:03:45 -0400
commiteb92044eb3d59d29c9812e85e3a4bf41f6f38e3a (patch)
tree155d37bb27ce0c312c2825732b3d0361b8209a49 /arch/arm/mach-imx/mm-imx3.c
parent821dc4dfd955da0679872088025542a0795c6b3e (diff)
ARM i.MX3: Make ccm base address a variable
Instead of having a cpu_is_* in each ccm register access it is more efficient to make it a variable. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/mm-imx3.c')
-rw-r--r--arch/arm/mach-imx/mm-imx3.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mm-imx3.c b/arch/arm/mach-imx/mm-imx3.c
index 74127389e7ab..57b39f839f9e 100644
--- a/arch/arm/mach-imx/mm-imx3.c
+++ b/arch/arm/mach-imx/mm-imx3.c
@@ -31,6 +31,10 @@
31#include <mach/iomux-v3.h> 31#include <mach/iomux-v3.h>
32#include <mach/irqs.h> 32#include <mach/irqs.h>
33 33
34#include "crmregs-imx3.h"
35
36void __iomem *mx3_ccm_base;
37
34static void imx3_idle(void) 38static void imx3_idle(void)
35{ 39{
36 unsigned long reg = 0; 40 unsigned long reg = 0;
@@ -137,6 +141,7 @@ void __init imx31_init_early(void)
137 mxc_arch_reset_init(MX31_IO_ADDRESS(MX31_WDOG_BASE_ADDR)); 141 mxc_arch_reset_init(MX31_IO_ADDRESS(MX31_WDOG_BASE_ADDR));
138 arch_ioremap_caller = imx3_ioremap_caller; 142 arch_ioremap_caller = imx3_ioremap_caller;
139 arm_pm_idle = imx3_idle; 143 arm_pm_idle = imx3_idle;
144 mx3_ccm_base = MX31_IO_ADDRESS(MX31_CCM_BASE_ADDR);
140} 145}
141 146
142void __init mx31_init_irq(void) 147void __init mx31_init_irq(void)
@@ -210,6 +215,7 @@ void __init imx35_init_early(void)
210 mxc_arch_reset_init(MX35_IO_ADDRESS(MX35_WDOG_BASE_ADDR)); 215 mxc_arch_reset_init(MX35_IO_ADDRESS(MX35_WDOG_BASE_ADDR));
211 arm_pm_idle = imx3_idle; 216 arm_pm_idle = imx3_idle;
212 arch_ioremap_caller = imx3_ioremap_caller; 217 arch_ioremap_caller = imx3_ioremap_caller;
218 mx3_ccm_base = MX35_IO_ADDRESS(MX35_CCM_BASE_ADDR);
213} 219}
214 220
215void __init mx35_init_irq(void) 221void __init mx35_init_irq(void)