From: linux@arm.linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 09/11] ARM: realview/vexpress: consolidate localtimer support
Date: Thu, 27 Jan 2011 13:48:49 +0000 [thread overview]
Message-ID: <E1PiSDR-0003pP-FK@rmk-PC.arm.linux.org.uk> (raw)
In-Reply-To: <20110127134532.GE25968@n2100.arm.linux.org.uk>
Realview and Versatile Express local timer support is identical, so
consolidate the implementations.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
arch/arm/mach-realview/Makefile | 1 -
arch/arm/mach-realview/localtimer.c | 26 --------------------------
arch/arm/mach-vexpress/Makefile | 1 -
arch/arm/mach-vexpress/localtimer.c | 26 --------------------------
arch/arm/plat-versatile/Makefile | 1 +
arch/arm/plat-versatile/localtimer.c | 26 ++++++++++++++++++++++++++
6 files changed, 27 insertions(+), 54 deletions(-)
delete mode 100644 arch/arm/mach-realview/localtimer.c
delete mode 100644 arch/arm/mach-vexpress/localtimer.c
create mode 100644 arch/arm/plat-versatile/localtimer.c
diff --git a/arch/arm/mach-realview/Makefile b/arch/arm/mach-realview/Makefile
index a01b76b..ba85e52 100644
--- a/arch/arm/mach-realview/Makefile
+++ b/arch/arm/mach-realview/Makefile
@@ -10,4 +10,3 @@ obj-$(CONFIG_MACH_REALVIEW_PBA8) += realview_pba8.o
obj-$(CONFIG_MACH_REALVIEW_PBX) += realview_pbx.o
obj-$(CONFIG_SMP) += platsmp.o headsmp.o
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
-obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o
diff --git a/arch/arm/mach-realview/localtimer.c b/arch/arm/mach-realview/localtimer.c
deleted file mode 100644
index 60b4e11..0000000
--- a/arch/arm/mach-realview/localtimer.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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);
-}
diff --git a/arch/arm/mach-vexpress/Makefile b/arch/arm/mach-vexpress/Makefile
index 2c0ac7d..cfe344e 100644
--- a/arch/arm/mach-vexpress/Makefile
+++ b/arch/arm/mach-vexpress/Makefile
@@ -6,4 +6,3 @@ obj-y := v2m.o
obj-$(CONFIG_ARCH_VEXPRESS_CA9X4) += ct-ca9x4.o
obj-$(CONFIG_SMP) += platsmp.o headsmp.o
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
-obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o
diff --git a/arch/arm/mach-vexpress/localtimer.c b/arch/arm/mach-vexpress/localtimer.c
deleted file mode 100644
index c0e3a59..0000000
--- a/arch/arm/mach-vexpress/localtimer.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * linux/arch/arm/mach-vexpress/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/smp_twd.h>
-#include <asm/localtimer.h>
-#include <mach/irqs.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);
-}
diff --git a/arch/arm/plat-versatile/Makefile b/arch/arm/plat-versatile/Makefile
index 41f57f4..b511abb 100644
--- a/arch/arm/plat-versatile/Makefile
+++ b/arch/arm/plat-versatile/Makefile
@@ -1,4 +1,5 @@
obj-y := clock.o
+obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o
obj-$(CONFIG_PLAT_VERSATILE_CLCD) += clcd.o
obj-$(CONFIG_PLAT_VERSATILE_FPGA_IRQ) += fpga-irq.o
obj-$(CONFIG_PLAT_VERSATILE_LEDS) += leds.o
diff --git a/arch/arm/plat-versatile/localtimer.c b/arch/arm/plat-versatile/localtimer.c
new file mode 100644
index 0000000..83ebee5
--- /dev/null
+++ b/arch/arm/plat-versatile/localtimer.c
@@ -0,0 +1,26 @@
+/*
+ * linux/arch/arm/plat-versatile/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/smp_twd.h>
+#include <asm/localtimer.h>
+#include <mach/irqs.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);
+}
--
1.6.2.5
next prev parent reply other threads:[~2011-01-27 13:48 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-27 13:45 [PATCH 00/11] Rationalize and consolidate ARMs evaluation boards Russell King - ARM Linux
2011-01-27 13:46 ` [PATCH 01/11] ARM: integrator: use new init_early for clock tree init Russell King - ARM Linux
2011-02-04 19:27 ` Rob Herring
2011-02-04 19:31 ` Grant Likely
2011-02-04 19:34 ` Russell King - ARM Linux
2011-02-04 19:53 ` Rob Herring
2011-02-04 19:59 ` Russell King - ARM Linux
2011-01-27 13:46 ` [PATCH 02/11] ARM: versatile: use new init_early for clock tree and sched_clock init Russell King - ARM Linux
2011-01-27 13:46 ` [PATCH 03/11] ARM: realview: " Russell King - ARM Linux
2011-01-27 13:47 ` [PATCH 04/11] ARM: vexpress: " Russell King - ARM Linux
2011-01-27 13:47 ` [PATCH 05/11] ARM: versatile: remove old AMBA device DMA definitions Russell King - ARM Linux
2011-01-27 13:47 ` [PATCH 06/11] ARM: realview: " Russell King - ARM Linux
2011-01-27 14:40 ` Linus Walleij
2011-01-27 13:48 ` [PATCH 07/11] ARM: rationalize versatile family Kconfig/Makefile Russell King - ARM Linux
2011-01-27 13:48 ` [PATCH 08/11] ARM: integrator/versatile: consolidate FPGA IRQ handling code Russell King - ARM Linux
2011-01-27 13:48 ` Russell King - ARM Linux [this message]
2011-01-27 13:49 ` [PATCH 10/11] ARM: realview/vexpress: consolidate SMP bringup code Russell King - ARM Linux
2011-01-27 13:49 ` [PATCH 11/11] ARM: integrator: add Integrator/CP sched_clock support Russell King - ARM Linux
2011-02-18 11:34 ` [PATCH 00/11] Rationalize and consolidate ARMs evaluation boards Catalin Marinas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1PiSDR-0003pP-FK@rmk-PC.arm.linux.org.uk \
--to=linux@arm.linux.org.uk \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).