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

Commit 8a9618f5 authored by Rob Herring's avatar Rob Herring Committed by Russell King
Browse files

ARM: 6432/1: move timer-sp.c from versatile to common 



From: Rob Herring <rob.herring@smooth-stone.com>

The timer-sp h/w used on versatile platforms can also be used for other
platforms, so move it to a common location.

Signed-off-by: default avatarRob Herring <rob.herring@smooth-stone.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent ff8b16d7

arch/arm/common/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -17,3 +17,4 @@ obj-$(CONFIG_ARCH_IXP2000) += uengine.o 
obj-$(CONFIG_ARCH_IXP23XX)	+= uengine.o

obj-$(CONFIG_PCI_HOST_ITE8152)  += it8152.o

obj-$(CONFIG_COMMON_CLKDEV)	+= clkdev.o

obj-$(CONFIG_ARM_TIMER_SP804)	+= timer-sp.o

arch/arm/plat-versatile/timer-sp.c→arch/arm/common/timer-sp.c

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

 *  linux/arch/arm/plat-versatile/timer-sp.c

 *  linux/arch/arm/common/timer-sp.c

 *

 *  Copyright (C) 1999 - 2003 ARM Limited

 *  Copyright (C) 2000 Deep Blue Solutions Ltd
@@ -26,8 +26,6 @@ 


#include <asm/hardware/arm_timer.h>



#include <plat/timer-sp.h>



/*

 * These timers are currently always setup to be clocked at 1MHz.

 */

arch/arm/mach-integrator/integrator_cp.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
#include <asm/mach/map.h>

#include <asm/mach/time.h>



#include <plat/timer-sp.h>

#include <asm/hardware/timer-sp.h>



#include "common.h"

arch/arm/mach-realview/core.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
#include <mach/clkdev.h>

#include <mach/platform.h>

#include <mach/irqs.h>

#include <plat/timer-sp.h>

#include <asm/hardware/timer-sp.h>



#include "core.h"