diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-05-25 06:21:38 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-08-07 06:10:51 -0400 |
commit | 8db5d1a64d36d0750b88c6c13feeaf0e00be2eb4 (patch) | |
tree | ae11d834f6f7943777d13918570b6d294683c462 /arch/arm/mach-mx3 | |
parent | 4be3bd7849165e7efa6b0b35a23d6a3598d97465 (diff) |
MXC: pass base/irq to mxc_timer_init
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx3')
-rw-r--r-- | arch/arm/mach-mx3/clock-imx35.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-mx3/clock.c | 3 |
2 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 577ee83d1f60..4cf1849f552e 100644 --- a/arch/arm/mach-mx3/clock-imx35.c +++ b/arch/arm/mach-mx3/clock-imx35.c | |||
@@ -456,7 +456,7 @@ int __init mx35_clocks_init() | |||
456 | __raw_writel((3 << 26) | ll, CCM_BASE + CCM_CGR2); | 456 | __raw_writel((3 << 26) | ll, CCM_BASE + CCM_CGR2); |
457 | __raw_writel(0, CCM_BASE + CCM_CGR3); | 457 | __raw_writel(0, CCM_BASE + CCM_CGR3); |
458 | 458 | ||
459 | mxc_timer_init(&gpt_clk); | 459 | mxc_timer_init(&ipg_clk, IO_ADDRESS(GPT1_BASE_ADDR), MXC_INT_GPT); |
460 | 460 | ||
461 | return 0; | 461 | return 0; |
462 | } | 462 | } |
diff --git a/arch/arm/mach-mx3/clock.c b/arch/arm/mach-mx3/clock.c index 8b14239724c9..25b6f55bfb03 100644 --- a/arch/arm/mach-mx3/clock.c +++ b/arch/arm/mach-mx3/clock.c | |||
@@ -29,6 +29,7 @@ | |||
29 | 29 | ||
30 | #include <mach/clock.h> | 30 | #include <mach/clock.h> |
31 | #include <mach/hardware.h> | 31 | #include <mach/hardware.h> |
32 | #include <mach/mx31.h> | ||
32 | #include <mach/common.h> | 33 | #include <mach/common.h> |
33 | 34 | ||
34 | #include "crm_regs.h" | 35 | #include "crm_regs.h" |
@@ -609,7 +610,7 @@ int __init mx31_clocks_init(unsigned long fref) | |||
609 | __raw_writel(reg, MXC_CCM_PMCR1); | 610 | __raw_writel(reg, MXC_CCM_PMCR1); |
610 | } | 611 | } |
611 | 612 | ||
612 | mxc_timer_init(&ipg_clk); | 613 | mxc_timer_init(&ipg_clk, IO_ADDRESS(GPT1_BASE_ADDR), MXC_INT_GPT); |
613 | 614 | ||
614 | return 0; | 615 | return 0; |
615 | } | 616 | } |