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

Commit cdab142a authored by Russell King's avatar Russell King
Browse files

ARM: realview/vexpress: consolidate localtimer support 



Realview and Versatile Express local timer support is identical, so
consolidate the implementations.

Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c41b16f8

arch/arm/mach-realview/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -10,4 +10,3 @@ obj-$(CONFIG_MACH_REALVIEW_PBA8) += realview_pba8.o 
obj-$(CONFIG_MACH_REALVIEW_PBX)		+= realview_pbx.o

obj-$(CONFIG_MACH_REALVIEW_PBX)		+= realview_pbx.o

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

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

obj-$(CONFIG_HOTPLUG_CPU)		+= hotplug.o
 
obj-$(CONFIG_HOTPLUG_CPU)		+= hotplug.o
 
obj-$(CONFIG_LOCAL_TIMERS)		+= localtimer.o

arch/arm/mach-realview/localtimer.c

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

 *  linux/arch/arm/mach-realview/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.

 */

void __cpuinit local_timer_setup(struct clock_event_device *evt)

{

	evt->irq = IRQ_LOCALTIMER;

	twd_timer_setup(evt);

}

arch/arm/mach-vexpress/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -6,4 +6,3 @@ obj-y := v2m.o 
obj-$(CONFIG_ARCH_VEXPRESS_CA9X4)	+= ct-ca9x4.o

obj-$(CONFIG_ARCH_VEXPRESS_CA9X4)	+= ct-ca9x4.o

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

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

obj-$(CONFIG_HOTPLUG_CPU)		+= hotplug.o
 
obj-$(CONFIG_HOTPLUG_CPU)		+= hotplug.o
 
obj-$(CONFIG_LOCAL_TIMERS)		+= localtimer.o

arch/arm/plat-versatile/Makefile

+1 −0
Original line number Original line Diff line number Diff line 
obj-y	:= clock.o

obj-y	:= clock.o

obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o

obj-$(CONFIG_PLAT_VERSATILE_CLCD) += clcd.o

obj-$(CONFIG_PLAT_VERSATILE_CLCD) += clcd.o

obj-$(CONFIG_PLAT_VERSATILE_FPGA_IRQ) += fpga-irq.o

obj-$(CONFIG_PLAT_VERSATILE_FPGA_IRQ) += fpga-irq.o

obj-$(CONFIG_PLAT_VERSATILE_LEDS) += leds.o

obj-$(CONFIG_PLAT_VERSATILE_LEDS) += leds.o

arch/arm/mach-vexpress/localtimer.c→arch/arm/plat-versatile/localtimer.c

+1 −1
Original line number Original line Diff line number Diff line 
/*

/*

 *  linux/arch/arm/mach-vexpress/localtimer.c

 *  linux/arch/arm/plat-versatile/localtimer.c

 *

 *

 *  Copyright (C) 2002 ARM Ltd.

 *  Copyright (C) 2002 ARM Ltd.

 *  All Rights Reserved

 *  All Rights Reserved