aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJuergen Beisert <j.beisert@pengutronix.de>2008-07-05 04:02:53 -0400
committerRobert Schwebel <r.schwebel@pengutronix.de>2008-07-05 04:02:53 -0400
commit9e8a30dce1bd38cf7b941c707da504d28a907f5c (patch)
tree45fe33c808f1e224fcd2628ce4bdbd9b5bf4c713 /arch
parent9a4cd7a5c836e189a1712c9ffd2d76b2302ce212 (diff)
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')
-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 @@
26#include <asm/hardware.h> 26#include <asm/hardware.h>
27#include <asm/mach-types.h> 27#include <asm/mach-types.h>
28#include <asm/mach/arch.h> 28#include <asm/mach/arch.h>
29#include <asm/mach/time.h>
29#include <asm/mach/map.h> 30#include <asm/mach/map.h>
30#include <asm/arch/common.h> 31#include <asm/arch/common.h>
31#include <asm/page.h> 32#include <asm/page.h>
@@ -79,6 +80,16 @@ static void __init mxc_board_init(void)
79{ 80{
80} 81}
81 82
83static void __init mx31lite_timer_init(void)
84{
85 mxc_clocks_init(26000000);
86 mxc_timer_init("ipg_clk.0");
87}
88
89struct sys_timer mx31lite_timer = {
90 .init = mx31lite_timer_init,
91};
92
82/* 93/*
83 * The following uses standard kernel macros defined in arch.h in order to 94 * The following uses standard kernel macros defined in arch.h in order to
84 * initialize __mach_desc_MX31LITE data structure. 95 * initialize __mach_desc_MX31LITE data structure.
@@ -92,5 +103,5 @@ MACHINE_START(MX31LITE, "LogicPD MX31 LITEKIT")
92 .map_io = mx31lite_map_io, 103 .map_io = mx31lite_map_io,
93 .init_irq = mxc_init_irq, 104 .init_irq = mxc_init_irq,
94 .init_machine = mxc_board_init, 105 .init_machine = mxc_board_init,
95 .timer = &mxc_timer, 106 .timer = &mx31lite_timer,
96MACHINE_END 107MACHINE_END