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

Commit 08efd6ca authored by Marc Zyngier's avatar Marc Zyngier
Browse files

ARM: ux500: convert to twd_local_timer_register() interface 



Add support for the new smp_twd runtime registration interface
to the ux500 platforms, and remove the old compile-time support.

Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 4200b16d

arch/arm/mach-ux500/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ obj-$(CONFIG_MACH_U8500) += board-mop500.o board-mop500-sdi.o \ 
obj-$(CONFIG_MACH_U5500)	+= board-u5500.o board-u5500-sdi.o

obj-$(CONFIG_SMP)		+= platsmp.o headsmp.o

obj-$(CONFIG_HOTPLUG_CPU)	+= hotplug.o

obj-$(CONFIG_LOCAL_TIMERS)	+= localtimer.o

obj-$(CONFIG_U5500_MODEM_IRQ)	+= modem-irq-db5500.o

obj-$(CONFIG_U5500_MBOX)	+= mbox-db5500.o

arch/arm/mach-ux500/cpu.c

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 


#include <asm/hardware/gic.h>

#include <asm/mach/map.h>

#include <asm/localtimer.h>



#include <mach/hardware.h>

#include <mach/setup.h>

arch/arm/mach-ux500/localtimer.c

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2008-2009 ST-Ericsson

 * Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>

 *

 * This file is heavily based on relaview platform, almost a copy.

 *

 * Copyright (C) 2002 ARM Ltd.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

#include <linux/init.h>

#include <linux/smp.h>

#include <linux/clockchips.h>



#include <asm/irq.h>

#include <asm/smp_twd.h>

#include <asm/localtimer.h>



/*

 * Setup the local clock events for a CPU.

 */

int __cpuinit local_timer_setup(struct clock_event_device *evt)

{

	evt->irq = IRQ_LOCALTIMER;

	twd_timer_setup(evt);

	return 0;

}

arch/arm/mach-ux500/timer.c

+25 −7
Original line number Diff line number Diff line
@@ -8,28 +8,45 @@ 
#include <linux/errno.h>

#include <linux/clksrc-dbx500-prcmu.h>



#include <asm/localtimer.h>

#include <asm/smp_twd.h>



#include <plat/mtu.h>



#include <mach/setup.h>

#include <mach/hardware.h>



#ifdef CONFIG_HAVE_ARM_TWD

static DEFINE_TWD_LOCAL_TIMER(u5500_twd_local_timer,

			      U5500_TWD_BASE, IRQ_LOCALTIMER);

static DEFINE_TWD_LOCAL_TIMER(u8500_twd_local_timer,

			      U8500_TWD_BASE, IRQ_LOCALTIMER);



static void __init ux500_twd_init(void)

{

	struct twd_local_timer *twd_local_timer;

	int err;



	twd_local_timer = cpu_is_u5500() ? &u5500_twd_local_timer :

					   &u8500_twd_local_timer;



	err = twd_local_timer_register(twd_local_timer);

	if (err)

		pr_err("twd_local_timer_register failed %d\n", err);

}

#else

#define ux500_twd_init()	do { } while(0)

#endif



static void __init ux500_timer_init(void)

{

	void __iomem *mtu_timer_base;

	void __iomem *prcmu_timer_base;

	int err;



	if (cpu_is_u5500()) {

#ifdef CONFIG_LOCAL_TIMERS

		twd_base = __io_address(U5500_TWD_BASE);

#endif

		mtu_timer_base = __io_address(U5500_MTU0_BASE);

		prcmu_timer_base = __io_address(U5500_PRCMU_TIMER_3_BASE);

	} else if (cpu_is_u8500()) {

#ifdef CONFIG_LOCAL_TIMERS

		twd_base = __io_address(U8500_TWD_BASE);

#endif

		mtu_timer_base = __io_address(U8500_MTU0_BASE);

		prcmu_timer_base = __io_address(U8500_PRCMU_TIMER_4_BASE);

	} else {
@@ -55,6 +72,7 @@ static void __init ux500_timer_init(void) 


	nmdk_timer_init(mtu_timer_base);

	clksrc_dbx500_prcmu_init(prcmu_timer_base);

	ux500_twd_init();

}



static void ux500_timer_reset(void)