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

Commit 0b7402dc authored by Sudeep Holla's avatar Sudeep Holla Committed by Russell King
Browse files

ARM: 8366/1: move Dual-Timer SP804 driver to drivers/clocksource 



The ARM Dual-Timer SP804 module is peripheral found not only on ARM32
platforms but also on ARM64 platforms.

This patch moves the driver out of arch/arm to driver/clocksource
so that it can be used on ARM64 platforms also.

Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Rob Herring <robh@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Olof Johansson <olof@lixom.net>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 1e5f0519

arch/arm/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -975,11 +975,6 @@ config PLAT_PXA 
config PLAT_VERSATILE

	bool



config ARM_TIMER_SP804

	bool

	select CLKSRC_MMIO

	select CLKSRC_OF if OF



source "arch/arm/firmware/Kconfig"



source arch/arm/mm/Kconfig

arch/arm/common/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ obj-$(CONFIG_SHARP_LOCOMO) += locomo.o 
obj-$(CONFIG_SHARP_PARAM)	+= sharpsl_param.o

obj-$(CONFIG_SHARP_SCOOP)	+= scoop.o

obj-$(CONFIG_PCI_HOST_ITE8152)  += it8152.o

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

obj-$(CONFIG_MCPM)		+= mcpm_head.o mcpm_entry.o mcpm_platsmp.o vlock.o

CFLAGS_REMOVE_mcpm_entry.o	= -pg

AFLAGS_mcpm_head.o		:= -march=armv7-a

arch/arm/mach-nspire/nspire.c

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 
#include <asm/mach-types.h>

#include <asm/mach/map.h>



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



#include "mmio.h"

#include "clcd.h"

arch/arm/mach-realview/core.c

+2 −2
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ 
#include <linux/mtd/physmap.h>

#include <linux/memblock.h>



#include <clocksource/timer-sp804.h>



#include <mach/hardware.h>

#include <asm/irq.h>

#include <asm/mach-types.h>
@@ -44,10 +46,8 @@ 
#include <asm/mach/irq.h>

#include <asm/mach/map.h>





#include <mach/platform.h>

#include <mach/irqs.h>

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



#include <plat/sched_clock.h>

arch/arm/mach-versatile/core.c

+2 −1
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ 
#include <linux/bitops.h>

#include <linux/reboot.h>



#include <clocksource/timer-sp804.h>



#include <asm/irq.h>

#include <asm/hardware/icst.h>

#include <asm/mach-types.h>
@@ -51,7 +53,6 @@ 
#include <asm/mach/map.h>

#include <mach/hardware.h>

#include <mach/platform.h>

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



#include <plat/sched_clock.h>