evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ARM: 5962/1: ux500: move system timer to cpu file

Browse source 
There is nothing board-specific about the system timer, so move it to
the CPU file.

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-03-01 05:03:31 +01:00 • committed by Russell King
parent 3e3c62ca53
commit cc2c133425
3 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,11 +17,9 @@
#include <linux/amba/pl022.h> #include <linux/amba/pl022.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <asm/localtimer.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <plat/mtu.h>
#include <plat/i2c.h> #include <plat/i2c.h>
#include <mach/hardware.h> #include <mach/hardware.h>
@ -201,22 +199,6 @@ static struct platform_device *platform_devs[] __initdata = {
&i2c_controller3, &i2c_controller3,
}; };
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 */
mtu_base = __io_address(U8500_MTU0_BASE);
nmdk_timer_init();
}
static struct sys_timer u8500_timer = {
.init = u8500_timer_init,
};
static void __init u8500_init_machine(void) static void __init u8500_init_machine(void)
{ {
int i; int i;

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

@ -14,10 +14,14 @@
#include <linux/amba/bus.h> #include <linux/amba/bus.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/io.h>
#include <asm/localtimer.h>
#include <asm/hardware/gic.h> #include <asm/hardware/gic.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <plat/mtu.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/setup.h>
/* add any platform devices here - TODO */ /* add any platform devices here - TODO */
static struct platform_device *platform_devs[] __initdata = { static struct platform_device *platform_devs[] __initdata = {
@ -63,3 +67,19 @@ void __init u8500_init_devices(void)
return ; 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 */
mtu_base = __io_address(U8500_MTU0_BASE);
nmdk_timer_init();
}
struct sys_timer u8500_timer = {
.init = u8500_timer_init,
};

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

@ -20,4 +20,7 @@ extern void u8500_init_irq(void);
/* We re-use nomadik_timer for this platform */ /* We re-use nomadik_timer for this platform */
extern void nmdk_timer_init(void); extern void nmdk_timer_init(void);
struct sys_timer;
extern struct sys_timer u8500_timer;
#endif /* __ASM_ARCH_SETUP_H */ #endif /* __ASM_ARCH_SETUP_H */