diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2009-12-16 13:07:20 -0500 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-01-08 10:44:24 -0500 |
commit | 6ef9af6871e3f220c6c7facf90babe6931d972bd (patch) | |
tree | 03dac7cc3218471824f823fcab1c6182a957a09a /arch/arm/mach-mx3 | |
parent | df9375fad4f99b28f5a500d9aa2cbb04e065ac97 (diff) |
imx35: define and use MX35_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: Jürgen Beisert <j.beisert@pengutronix.de>
Cc: Rabin Vincent <rabin@rab.in>
Cc: Valentin Longchamp <valentin.longchamp@epfl.ch>
Diffstat (limited to 'arch/arm/mach-mx3')
-rw-r--r-- | arch/arm/mach-mx3/clock-imx35.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-mx3/clock-imx35.c b/arch/arm/mach-mx3/clock-imx35.c index e65e862774ef..07d630ebc286 100644 --- a/arch/arm/mach-mx3/clock-imx35.c +++ b/arch/arm/mach-mx3/clock-imx35.c | |||
@@ -28,7 +28,7 @@ | |||
28 | #include <mach/hardware.h> | 28 | #include <mach/hardware.h> |
29 | #include <mach/common.h> | 29 | #include <mach/common.h> |
30 | 30 | ||
31 | #define CCM_BASE IO_ADDRESS(MX35_CCM_BASE_ADDR) | 31 | #define CCM_BASE MX35_IO_ADDRESS(MX35_CCM_BASE_ADDR) |
32 | 32 | ||
33 | #define CCM_CCMR 0x00 | 33 | #define CCM_CCMR 0x00 |
34 | #define CCM_PDR0 0x04 | 34 | #define CCM_PDR0 0x04 |
@@ -504,7 +504,8 @@ int __init mx35_clocks_init() | |||
504 | __raw_writel((3 << 26) | ll, CCM_BASE + CCM_CGR2); | 504 | __raw_writel((3 << 26) | ll, CCM_BASE + CCM_CGR2); |
505 | __raw_writel(0, CCM_BASE + CCM_CGR3); | 505 | __raw_writel(0, CCM_BASE + CCM_CGR3); |
506 | 506 | ||
507 | mxc_timer_init(&gpt_clk, IO_ADDRESS(MX35_GPT1_BASE_ADDR), MX35_INT_GPT); | 507 | mxc_timer_init(&gpt_clk, |
508 | MX35_IO_ADDRESS(MX35_GPT1_BASE_ADDR), MX35_INT_GPT); | ||
508 | 509 | ||
509 | return 0; | 510 | return 0; |
510 | } | 511 | } |