[PATCH 2/8] ARM: zynq: move ttc timer code to drivers/clocksource
From: Josh Cartwright <hidden>
Date: 2012-10-31 23:12:57
Also in:
linux-arm-kernel, linux-devicetree, lkml
Subsystem:
arm port, arm/zynq architecture, clocksource, clockevent drivers, the rest · Maintainers:
Russell King, Michal Simek, Daniel Lezcano, Thomas Gleixner, Linus Torvalds
Suggested cleanup by Arnd Bergmann. Move the ttc timer.c code to drivers/clocksource, and out of the mach-zynq directory. The common.h (which only held the timer declaration) was renamed to xilinx_ttc.h and moved into include/linux. Signed-off-by: Josh Cartwright <redacted> Cc: Arnd Bergmann <arnd@arndb.de> --- arch/arm/mach-zynq/Makefile | 2 +- arch/arm/mach-zynq/common.c | 2 +- drivers/clocksource/Makefile | 1 + arch/arm/mach-zynq/timer.c => drivers/clocksource/xilinx_ttc.c | 1 - arch/arm/mach-zynq/common.h => include/linux/xilinx_ttc.h | 4 ++-- 5 files changed, 5 insertions(+), 5 deletions(-) rename arch/arm/mach-zynq/timer.c => drivers/clocksource/xilinx_ttc.c (99%) rename arch/arm/mach-zynq/common.h => include/linux/xilinx_ttc.h (91%)
diff --git a/arch/arm/mach-zynq/Makefile b/arch/arm/mach-zynq/Makefile
index 397268c..320faed 100644
--- a/arch/arm/mach-zynq/Makefile
+++ b/arch/arm/mach-zynq/Makefile@@ -3,4 +3,4 @@ # # Common support -obj-y := common.o timer.o +obj-y := common.o
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index 6f058258..0279ea7 100644
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c@@ -22,6 +22,7 @@ #include <linux/of_irq.h> #include <linux/of_platform.h> #include <linux/of.h> +#include <linux/xilinx_ttc.h> #include <asm/mach/arch.h> #include <asm/mach/map.h>
@@ -32,7 +33,6 @@ #include <asm/hardware/cache-l2x0.h> #include <mach/zynq_soc.h> -#include "common.h" static struct of_device_id zynq_of_bus_ids[] __initdata = { { .compatible = "simple-bus", },
diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile
index 603be36..f27c7b1 100644
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile@@ -14,5 +14,6 @@ obj-$(CONFIG_DW_APB_TIMER_OF) += dw_apb_timer_of.o obj-$(CONFIG_CLKSRC_DBX500_PRCMU) += clksrc-dbx500-prcmu.o obj-$(CONFIG_ARMADA_370_XP_TIMER) += time-armada-370-xp.o obj-$(CONFIG_ARCH_BCM2835) += bcm2835_timer.o +obj-$(CONFIG_ARCH_ZYNQ) += xilinx_ttc.o obj-$(CONFIG_CLKSRC_ARM_GENERIC) += arm_generic.o
diff --git a/arch/arm/mach-zynq/timer.c b/drivers/clocksource/xilinx_ttc.c
similarity index 99%
rename from arch/arm/mach-zynq/timer.c
rename to drivers/clocksource/xilinx_ttc.c
index c93cbe5..ff38b3e 100644
--- a/arch/arm/mach-zynq/timer.c
+++ b/drivers/clocksource/xilinx_ttc.c@@ -25,7 +25,6 @@ #include <linux/io.h> #include <mach/zynq_soc.h> -#include "common.h" #define IRQ_TIMERCOUNTER0 42
diff --git a/arch/arm/mach-zynq/common.h b/include/linux/xilinx_ttc.h
similarity index 91%
rename from arch/arm/mach-zynq/common.h
rename to include/linux/xilinx_ttc.h
index 954b91c..303a3fd 100644
--- a/arch/arm/mach-zynq/common.h
+++ b/include/linux/xilinx_ttc.h@@ -14,8 +14,8 @@ * GNU General Public License for more details. */ -#ifndef __MACH_ZYNQ_COMMON_H__ -#define __MACH_ZYNQ_COMMON_H__ +#ifndef __XILINX_TTC_H__ +#define __XILINX_TTC_H__ void __init xttcpss_timer_init(void);
--
1.8.0