diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2009-12-16 11:29:39 -0500 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-01-08 10:41:24 -0500 |
commit | a3f5ac7838a93977f71288310336a725eb6e62db (patch) | |
tree | b71a4d22661d1f5bc914ddfc8725b43d819af3c8 /arch/arm/mach-mx2 | |
parent | 1f2ddd64da6e53365102d831aa9e0446b78f0300 (diff) |
imx21: define and use MX21_IO_ADDRESS
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Holger Schurig <hs4233@mail.mn-solutions.de>
Cc: Rabin Vincent <rabin@rab.in>
Cc: Agustín Ferrín Pozuelo <gatoguan-os@yahoo.com>
Diffstat (limited to 'arch/arm/mach-mx2')
-rw-r--r-- | arch/arm/mach-mx2/clock_imx21.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mx2/clock_imx21.c b/arch/arm/mach-mx2/clock_imx21.c index 6ab3c729a456..2367b6c5f071 100644 --- a/arch/arm/mach-mx2/clock_imx21.c +++ b/arch/arm/mach-mx2/clock_imx21.c | |||
@@ -28,7 +28,7 @@ | |||
28 | #include <asm/clkdev.h> | 28 | #include <asm/clkdev.h> |
29 | #include <asm/div64.h> | 29 | #include <asm/div64.h> |
30 | 30 | ||
31 | #define IO_ADDR_CCM(off) (IO_ADDRESS(MX21_CCM_BASE_ADDR) + (off)) | 31 | #define IO_ADDR_CCM(off) (MX21_IO_ADDRESS(MX21_CCM_BASE_ADDR) + (off)) |
32 | 32 | ||
33 | /* Register offsets */ | 33 | /* Register offsets */ |
34 | #define CCM_CSCR IO_ADDR_CCM(0x0) | 34 | #define CCM_CSCR IO_ADDR_CCM(0x0) |
@@ -1235,7 +1235,7 @@ int __init mx21_clocks_init(unsigned long lref, unsigned long href) | |||
1235 | clk_enable(&uart_clk[0]); | 1235 | clk_enable(&uart_clk[0]); |
1236 | #endif | 1236 | #endif |
1237 | 1237 | ||
1238 | mxc_timer_init(&gpt_clk[0], IO_ADDRESS(MX21_GPT1_BASE_ADDR), | 1238 | mxc_timer_init(&gpt_clk[0], MX21_IO_ADDRESS(MX21_GPT1_BASE_ADDR), |
1239 | MX21_INT_GPT1); | 1239 | MX21_INT_GPT1); |
1240 | return 0; | 1240 | return 0; |
1241 | } | 1241 | } |