From mboxrd@z Thu Jan 1 00:00:00 1970 From: haojian.zhuang@linaro.org (Haojian Zhuang) Date: Wed, 13 Mar 2013 13:05:32 +0800 Subject: [PATCH v3 01/11] clocksource: move sp timer driver In-Reply-To: <1363151142-32162-1-git-send-email-haojian.zhuang@linaro.org> References: <1363151142-32162-1-git-send-email-haojian.zhuang@linaro.org> Message-ID: <1363151142-32162-2-git-send-email-haojian.zhuang@linaro.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org All clocksource drivers should be moved into drivers/clocksource directory, since it's necessary for integrating them into clocksource_of infrastructure. Move ARM SP804 timer driver from arch/arm directory into drivers/clocksource directory. Signed-off-by: Haojian Zhuang --- arch/arm/Kconfig | 5 ----- arch/arm/common/Makefile | 1 - arch/arm/mach-highbank/highbank.c | 4 ++-- arch/arm/mach-integrator/integrator_ap.c | 2 +- arch/arm/mach-integrator/integrator_cp.c | 4 ++-- arch/arm/mach-realview/core.c | 4 ++-- arch/arm/mach-versatile/core.c | 4 ++-- arch/arm/mach-vexpress/ct-ca9x4.c | 5 ++--- arch/arm/mach-vexpress/v2m.c | 4 ++-- drivers/clocksource/Kconfig | 5 +++++ drivers/clocksource/Makefile | 1 + {arch/arm/common => drivers/clocksource}/timer-sp.c | 2 +- .../arm/include/asm/hardware => include/clocksource}/arm_timer.h | 4 ++-- {arch/arm/include/asm/hardware => include/clocksource}/timer-sp.h | 4 ++++ 14 files changed, 26 insertions(+), 23 deletions(-) rename {arch/arm/common => drivers/clocksource}/timer-sp.c (99%) rename {arch/arm/include/asm/hardware => include/clocksource}/arm_timer.h (93%) rename {arch/arm/include/asm/hardware => include/clocksource}/timer-sp.h (87%) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 2363926..10d7e2c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1177,11 +1177,6 @@ config PLAT_PXA config PLAT_VERSATILE bool -config ARM_TIMER_SP804 - bool - select CLKSRC_MMIO - select HAVE_SCHED_CLOCK - source arch/arm/mm/Kconfig config ARM_NR_BANKS diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile index 45f7eae..a4e49e7 100644 --- a/arch/arm/common/Makefile +++ b/arch/arm/common/Makefile @@ -12,4 +12,3 @@ 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 diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c index a4f9f50..cfd843b 100644 --- a/arch/arm/mach-highbank/highbank.c +++ b/arch/arm/mach-highbank/highbank.c @@ -27,14 +27,14 @@ #include #include #include +#include +#include #include #include #include #include #include -#include -#include #include #include #include diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c index ea96144..c2112ff 100644 --- a/arch/arm/mach-integrator/integrator_ap.c +++ b/arch/arm/mach-integrator/integrator_ap.c @@ -41,11 +41,11 @@ #include #include #include +#include #include