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-mx2 | |
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-mx2')
-rw-r--r-- | arch/arm/mach-mx2/clock_imx21.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-mx2/clock_imx27.c | 2 |
2 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 0850fb88ec15..eede79855f4a 100644 --- a/arch/arm/mach-mx2/clock_imx21.c +++ b/arch/arm/mach-mx2/clock_imx21.c | |||
@@ -1004,6 +1004,6 @@ int __init mx21_clocks_init(unsigned long lref, unsigned long href) | |||
1004 | clk_enable(&uart_clk[0]); | 1004 | clk_enable(&uart_clk[0]); |
1005 | #endif | 1005 | #endif |
1006 | 1006 | ||
1007 | mxc_timer_init(&gpt_clk[0]); | 1007 | mxc_timer_init(&gpt_clk[0], IO_ADDRESS(GPT1_BASE_ADDR), MXC_INT_GPT1); |
1008 | return 0; | 1008 | return 0; |
1009 | } | 1009 | } |
diff --git a/arch/arm/mach-mx2/clock_imx27.c b/arch/arm/mach-mx2/clock_imx27.c index 2c971442f3f2..a0c577f80d4c 100644 --- a/arch/arm/mach-mx2/clock_imx27.c +++ b/arch/arm/mach-mx2/clock_imx27.c | |||
@@ -748,7 +748,7 @@ int __init mx27_clocks_init(unsigned long fref) | |||
748 | clk_enable(&uart1_clk); | 748 | clk_enable(&uart1_clk); |
749 | #endif | 749 | #endif |
750 | 750 | ||
751 | mxc_timer_init(&gpt1_clk); | 751 | mxc_timer_init(&gpt1_clk, IO_ADDRESS(GPT1_BASE_ADDR), MXC_INT_GPT1); |
752 | 752 | ||
753 | return 0; | 753 | return 0; |
754 | } | 754 | } |