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

Commit 1fcf3a6e authored by Marc Zyngier's avatar Marc Zyngier
Browse files

ARM: tegra: convert to twd_local_timer_register() interface 



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

Acked-by: default avatarStephen Warren <swarren@nvidia.com>
Cc: Colin Cross <ccross@android.com>
Cc: Olof Johansson <olof@lixom.net>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 7c380f27

arch/arm/mach-tegra/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra2_emc.o 
obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= pinmux-tegra20-tables.o

obj-$(CONFIG_ARCH_TEGRA_3x_SOC)		+= pinmux-tegra30-tables.o

obj-$(CONFIG_ARCH_TEGRA_3x_SOC)		+= board-dt-tegra30.o

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

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

obj-$(CONFIG_HOTPLUG_CPU)               += hotplug.o

obj-$(CONFIG_TEGRA_SYSTEM_DMA)		+= dma.o

obj-$(CONFIG_CPU_FREQ)                  += cpu-tegra.o

arch/arm/mach-tegra/localtimer.c

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

 *  arch/arm/mach-tegra/localtimer.c

 *

 *  Copyright (C) 2002 ARM Ltd.

 *  All Rights Reserved

 *

 * 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-tegra/timer.c

+17 −5
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include <linux/io.h>



#include <asm/mach/time.h>

#include <asm/localtimer.h>

#include <asm/smp_twd.h>

#include <asm/sched_clock.h>



#include <mach/iomap.h>
@@ -162,6 +162,21 @@ static struct irqaction tegra_timer_irq = { 
	.irq		= INT_TMR3,

};



#ifdef CONFIG_HAVE_ARM_TWD

static DEFINE_TWD_LOCAL_TIMER(twd_local_timer,

			      TEGRA_ARM_PERIF_BASE + 0x600,

			      IRQ_LOCALTIMER);



static void __init tegra_twd_init(void)

{

	int err = twd_local_timer_register(&twd_local_timer);

	if (err)

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

}

#else

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

#endif



static void __init tegra_init_timer(void)

{

	struct clk *clk;
@@ -188,10 +203,6 @@ static void __init tegra_init_timer(void) 
	else

		clk_enable(clk);



#ifdef CONFIG_HAVE_ARM_TWD

	twd_base = IO_ADDRESS(TEGRA_ARM_PERIF_BASE + 0x600);

#endif



	switch (rate) {

	case 12000000:

		timer_writel(0x000b, TIMERUS_USEC_CFG);
@@ -231,6 +242,7 @@ static void __init tegra_init_timer(void) 
	tegra_clockevent.cpumask = cpu_all_mask;

	tegra_clockevent.irq = tegra_timer_irq.irq;

	clockevents_register_device(&tegra_clockevent);

	tegra_twd_init();

}



struct sys_timer tegra_timer = {