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

Commit a45c983f authored by Marc Zyngier's avatar Marc Zyngier
Browse files

ARM: OMAP4: convert to twd_local_timer_register() interface 



Add support for the new smp_twd runtime registration interface
to the OMAP4 platforms, and remove the old compile-time support.
Tested on Panda.

Acked-by: default avatarTony Lindgren <tony@atomide.com>
Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent d8e03643

arch/arm/mach-omap2/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ obj-$(CONFIG_TWL4030_CORE) += omap_twl.o 


# SMP support ONLY available for OMAP4

obj-$(CONFIG_SMP)			+= omap-smp.o omap-headsmp.o

obj-$(CONFIG_LOCAL_TIMERS)		+= timer-mpu.o

obj-$(CONFIG_HOTPLUG_CPU)		+= omap-hotplug.o

obj-$(CONFIG_ARCH_OMAP4)		+= omap4-common.o omap-wakeupgen.o \

					   sleep44xx.o

arch/arm/mach-omap2/timer-mpu.c

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

 * The MPU local timer source file. In OMAP4, both cortex-a9 cores have

 * own timer in it's MPU domain. These timers will be driving the

 * linux kernel SMP tick framework when active. These timers are not

 * part of the wake up domain.

 *

 * Copyright (C) 2009 Texas Instruments, Inc.

 *

 * Author:

 *      Santosh Shilimkar <santosh.shilimkar@ti.com>

 *

 * This file is based on arm realview smp platform file.

 * 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)

{

	/* Local timers are not supprted on OMAP4430 ES1.0 */

	if (omap_rev() == OMAP4430_REV_ES1_0)

		return -ENXIO;



	evt->irq = OMAP44XX_IRQ_LOCALTIMER;

	twd_timer_setup(evt);

	return 0;

}

arch/arm/mach-omap2/timer.c

+17 −5
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 


#include <asm/mach/time.h>

#include <plat/dmtimer.h>

#include <asm/localtimer.h>

#include <asm/smp_twd.h>

#include <asm/sched_clock.h>

#include "common.h"

#include <plat/omap_hwmod.h>
@@ -324,14 +324,26 @@ OMAP_SYS_TIMER(3_secure) 
#endif



#ifdef CONFIG_ARCH_OMAP4

static void __init omap4_timer_init(void)

{

#ifdef CONFIG_LOCAL_TIMERS

	twd_base = ioremap(OMAP44XX_LOCAL_TWD_BASE, SZ_256);

	BUG_ON(!twd_base);

static DEFINE_TWD_LOCAL_TIMER(twd_local_timer,

			      OMAP44XX_LOCAL_TWD_BASE,

			      OMAP44XX_IRQ_LOCALTIMER);

#endif



static void __init omap4_timer_init(void)

{

	omap2_gp_clockevent_init(1, OMAP4_CLKEV_SOURCE);

	omap2_gp_clocksource_init(2, OMAP4_MPU_SOURCE);

#ifdef CONFIG_LOCAL_TIMERS

	/* Local timers are not supprted on OMAP4430 ES1.0 */

	if (omap_rev() != OMAP4430_REV_ES1_0) {

		int err;



		err = twd_local_timer_register(&twd_local_timer);

		if (err)

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

	}

#endif

}

OMAP_SYS_TIMER(4)

#endif