summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx3
diff options
context:
space:
mode:
authorJuergen Beisert <j.beisert@pengutronix.de>2008-07-05 10:02:53 +0200
committerRobert Schwebel <r.schwebel@pengutronix.de>2008-07-05 10:02:53 +0200
commit9e8a30dce1bd38cf7b941c707da504d28a907f5c (patch)
tree45fe33c808f1e224fcd2628ce4bdbd9b5bf4c713 /arch/arm/mach-mx3
parentMX3: Add basic support for LogicPD i.MX31 LiteKit (diff)
downloadlinux-9e8a30dce1bd38cf7b941c707da504d28a907f5c.tar.xz
linux-9e8a30dce1bd38cf7b941c707da504d28a907f5c.zip
MX3: Adapt mx31lite to new timer init style
This patch converts the external "add_mx31lite-basic_defconfig.diff" to our MXC implementation. Note: This patch fixes a board reference only. Signed-off-by: Juergen Beisert <j.beisert@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx3')
-rw-r--r--arch/arm/mach-mx3/mx31lite.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/arch/arm/mach-mx3/mx31lite.c b/arch/arm/mach-mx3/mx31lite.c
index ea23a8ec6850..1372c1a1fc3f 100644
--- a/arch/arm/mach-mx3/mx31lite.c
+++ b/arch/arm/mach-mx3/mx31lite.c
@@ -26,6 +26,7 @@
#include <asm/hardware.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+#include <asm/mach/time.h>
#include <asm/mach/map.h>
#include <asm/arch/common.h>
#include <asm/page.h>
@@ -79,6 +80,16 @@ static void __init mxc_board_init(void)
{
}
+static void __init mx31lite_timer_init(void)
+{
+ mxc_clocks_init(26000000);
+ mxc_timer_init("ipg_clk.0");
+}
+
+struct sys_timer mx31lite_timer = {
+ .init = mx31lite_timer_init,
+};
+
/*
* The following uses standard kernel macros defined in arch.h in order to
* initialize __mach_desc_MX31LITE data structure.
@@ -92,5 +103,5 @@ MACHINE_START(MX31LITE, "LogicPD MX31 LITEKIT")
.map_io = mx31lite_map_io,
.init_irq = mxc_init_irq,
.init_machine = mxc_board_init,
- .timer = &mxc_timer,
+ .timer = &mx31lite_timer,
MACHINE_END