Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc2c1334 authored by Rabin Vincent's avatar Rabin Vincent Committed by Russell King
Browse files

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



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

Acked-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Acked-by: default avatarSrinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Signed-off-by: default avatarRabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 3e3c62ca

arch/arm/mach-ux500/board-mop500.c

+0 −18
Original line number Original line Diff line number Diff line
@@ -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;

arch/arm/mach-ux500/cpu-u8500.c

+20 −0
Original line number Original line Diff line number Diff line
@@ -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,

};

arch/arm/mach-ux500/include/mach/setup.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -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 */