Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ARM: 6087/1: ux500: move sys_timer to cpu.c

Browse source 
Move the common system timer setup code to cpu.c.

Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Acked-by: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Rabin Vincent 2010-05-03 08:28:05 +01:00 committed by Russell King
parent 5b1f7ddf18
commit 41ac329f60
4 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/mach-ux500/board-mop500.c
View file

@ -145,6 +145,6 @@ MACHINE_START(U8500, "ST-Ericsson MOP500 platform")
.map_io = u8500_map_io,
.init_irq = ux500_init_irq,
/* we re-use nomadik timer here */
.timer = &u8500_timer,
.timer = &ux500_timer,
.init_machine = u8500_init_machine,
MACHINE_END

21
arch/arm/mach-ux500/cpu-u8500.c
View file

@ -17,9 +17,7 @@
#include <linux/platform_device.h>
#include <linux/io.h>
#include <asm/localtimer.h>
#include <asm/mach/map.h>
#include <plat/mtu.h>
#include <mach/hardware.h>
#include <mach/setup.h>
#include <mach/devices.h>
@ -78,22 +76,3 @@ void __init u8500_init_devices(void)
return ;
}
static void __init u8500_timer_init(void)
{
#ifdef CONFIG_LOCAL_TIMERS
/* Setup the local timer base */
twd_base = __io_address(U8500_TWD_BASE);
#endif
/* Setup the MTU base */
if (cpu_is_u8500ed())
mtu_base = __io_address(U8500_MTU0_BASE_ED);
else
mtu_base = __io_address(U8500_MTU0_BASE);
nmdk_timer_init();
}
struct sys_timer u8500_timer = {
.init = u8500_timer_init,
};

21
arch/arm/mach-ux500/cpu.c
View file

@ -13,7 +13,9 @@
#include <asm/hardware/cache-l2x0.h>
#include <asm/hardware/gic.h>
#include <asm/mach/map.h>
#include <asm/localtimer.h>
#include <plat/mtu.h>
#include <mach/hardware.h>
#include <mach/setup.h>
#include <mach/devices.h>
@ -76,3 +78,22 @@ static int ux500_l2x0_init(void)
}
early_initcall(ux500_l2x0_init);
#endif
static void __init ux500_timer_init(void)
{
#ifdef CONFIG_LOCAL_TIMERS
/* Setup the local timer base */
twd_base = __io_address(UX500_TWD_BASE);
#endif
/* Setup the MTU base */
if (cpu_is_u8500ed())
mtu_base = __io_address(U8500_MTU0_BASE_ED);
else
mtu_base = __io_address(UX500_MTU0_BASE);
nmdk_timer_init();
}
struct sys_timer ux500_timer = {
.init = ux500_timer_init,
};

2
arch/arm/mach-ux500/include/mach/setup.h
View file

@ -27,7 +27,7 @@ extern void nmdk_timer_init(void);
extern void __init amba_add_devices(struct amba_device *devs[], int num);
struct sys_timer;
extern struct sys_timer u8500_timer;
extern struct sys_timer ux500_timer;
#define __IO_DEV_DESC(x, sz) { \
.virtual = IO_ADDRESS(x), \