From: robherring2@gmail•com (Rob Herring)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v2 10/15] ARM: highbank: convert to twd_local_timer_register() interface
Date: Fri, 13 Jan 2012 13:07:23 -0600 [thread overview]
Message-ID: <4F1080EB.1010909@gmail.com> (raw)
In-Reply-To: <1326479322-6033-11-git-send-email-marc.zyngier@arm.com>
On 01/13/2012 12:28 PM, Marc Zyngier wrote:
> Add support for the new smp_twd runtime registration interface
> to the highbank platforms, and remove the old compile-time support.
>
> The highbank DTS file is updated to match the TWD DT documentation.
>
> Cc: Rob Herring <rob.herring@calxeda•com>
> Signed-off-by: Marc Zyngier <marc.zyngier@arm•com>
A couple of minor things below. Otherwise,
Acked-by: Rob Herring <rob.herring@calxeda•com>
> ---
> arch/arm/boot/dts/highbank.dts | 4 +-
> arch/arm/mach-highbank/Makefile | 1 -
> arch/arm/mach-highbank/highbank.c | 5 ++++
> arch/arm/mach-highbank/localtimer.c | 40 -----------------------------------
> 4 files changed, 7 insertions(+), 43 deletions(-)
> delete mode 100644 arch/arm/mach-highbank/localtimer.c
>
> diff --git a/arch/arm/boot/dts/highbank.dts b/arch/arm/boot/dts/highbank.dts
> index 305635b..661373a 100644
> --- a/arch/arm/boot/dts/highbank.dts
> +++ b/arch/arm/boot/dts/highbank.dts
> @@ -72,13 +72,13 @@
> ranges;
>
> timer at fff10600 {
> - compatible = "arm,smp-twd";
> + compatible = "arm,cortex-a9-twd-timer";
> reg = <0xfff10600 0x20>;
> interrupts = <1 13 0xf04>;
Would you mind fixing these to be edge triggered.
> };
>
> watchdog at fff10620 {
> - compatible = "arm,cortex-a9-wdt";
> + compatible = "arm,cortex-a9-twd-wdt";
> reg = <0xfff10620 0x20>;
> interrupts = <1 14 0xf04>;
> };
> diff --git a/arch/arm/mach-highbank/Makefile b/arch/arm/mach-highbank/Makefile
> index 986958a..f8437dd 100644
> --- a/arch/arm/mach-highbank/Makefile
> +++ b/arch/arm/mach-highbank/Makefile
> @@ -1,6 +1,5 @@
> obj-y := clock.o highbank.o system.o
> obj-$(CONFIG_DEBUG_HIGHBANK_UART) += lluart.o
> obj-$(CONFIG_SMP) += platsmp.o
> -obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o
> obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
> obj-$(CONFIG_PM_SLEEP) += pm.o
> diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c
> index 804c4a5..4ab27ab 100644
> --- a/arch/arm/mach-highbank/highbank.c
> +++ b/arch/arm/mach-highbank/highbank.c
> @@ -27,6 +27,7 @@
> #include <asm/cacheflush.h>
> #include <asm/unified.h>
> #include <asm/smp_scu.h>
> +#include <asm/smp_twd.h>
> #include <asm/hardware/arm_timer.h>
> #include <asm/hardware/timer-sp.h>
> #include <asm/hardware/gic.h>
> @@ -96,6 +97,7 @@ static void __init highbank_init_irq(void)
> static void __init highbank_timer_init(void)
> {
> int irq;
> + int err;
> struct device_node *np;
> void __iomem *timer_base;
>
> @@ -113,6 +115,9 @@ static void __init highbank_timer_init(void)
>
> sp804_clocksource_init(timer_base + 0x20, "timer1");
> sp804_clockevents_init(timer_base, irq, "timer0");
> +
> + err = twd_local_timer_of_register();
> + WARN_ON(err);
Perhaps the WARN should be inside twd_local_timer_of_register.
Rob
> }
>
> static struct sys_timer highbank_timer = {
> diff --git a/arch/arm/mach-highbank/localtimer.c b/arch/arm/mach-highbank/localtimer.c
> deleted file mode 100644
> index 5a00e79..0000000
> --- a/arch/arm/mach-highbank/localtimer.c
> +++ /dev/null
> @@ -1,40 +0,0 @@
> -/*
> - * Copyright 2010-2011 Calxeda, Inc.
> - * Based on localtimer.c, Copyright (C) 2002 ARM Ltd.
> - *
> - * This program is free software; you can redistribute it and/or modify it
> - * under the terms and conditions of the GNU General Public License,
> - * version 2, as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope it will be useful, but WITHOUT
> - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
> - * more details.
> - *
> - * You should have received a copy of the GNU General Public License along with
> - * this program. If not, see <http://www.gnu.org/licenses/>.
> - */
> -#include <linux/init.h>
> -#include <linux/clockchips.h>
> -#include <linux/of.h>
> -#include <linux/of_address.h>
> -#include <linux/of_irq.h>
> -
> -#include <asm/smp_twd.h>
> -
> -/*
> - * Setup the local clock events for a CPU.
> - */
> -int __cpuinit local_timer_setup(struct clock_event_device *evt)
> -{
> - struct device_node *np;
> -
> - np = of_find_compatible_node(NULL, NULL, "arm,smp-twd");
> - if (!twd_base) {
> - twd_base = of_iomap(np, 0);
> - WARN_ON(!twd_base);
> - }
> - evt->irq = irq_of_parse_and_map(np, 0);
> - twd_timer_setup(evt);
> - return 0;
> -}
next prev parent reply other threads:[~2012-01-13 19:07 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-13 18:28 [PATCH v2 00/15] Runtime registration for local timers Marc Zyngier
2012-01-13 18:28 ` [PATCH v2 01/15] ARM: smp_twd: make local_timer_stop a symbol instead of a #define Marc Zyngier
2012-01-13 18:28 ` [PATCH v2 02/15] ARM: local timers: introduce a new registration interface Marc Zyngier
2012-01-13 18:28 ` [PATCH v2 03/15] ARM: smp_twd: add runtime registration support Marc Zyngier
2012-01-13 18:28 ` [PATCH v2 04/15] ARM: smp_twd: add device tree support Marc Zyngier
2012-01-13 18:28 ` [PATCH v2 05/15] ARM: OMAP4: convert to twd_local_timer_register() interface Marc Zyngier
2012-01-13 18:28 ` [PATCH v2 06/15] ARM: plat-versatile: " Marc Zyngier
2012-01-13 18:28 ` [PATCH v2 07/15] ARM: tegra: " Marc Zyngier
2012-01-13 18:28 ` [PATCH v2 08/15] ARM: shmobile: " Marc Zyngier
2012-01-13 18:28 ` [PATCH v2 09/15] ARM: ux500: " Marc Zyngier
2012-01-13 18:28 ` [PATCH v2 10/15] ARM: highbank: " Marc Zyngier
2012-01-13 19:07 ` Rob Herring [this message]
2012-01-14 2:41 ` Shawn Guo
2012-01-14 8:46 ` Russell King - ARM Linux
2012-01-14 15:06 ` Rob Herring
2012-01-13 18:28 ` [PATCH v2 11/15] ARM: imx6q: " Marc Zyngier
2012-01-14 2:47 ` Shawn Guo
2012-01-13 18:28 ` [PATCH v2 12/15] ARM: smp_twd: remove old local timer interface Marc Zyngier
2012-01-13 18:28 ` [PATCH v2 13/15] ARM: local timers: convert exynos to runtime registration interface Marc Zyngier
2012-01-13 23:29 ` David Brown
2012-01-13 18:28 ` [PATCH v2 14/15] ARM: local timers: convert MSM " Marc Zyngier
2012-01-13 22:37 ` David Brown
2012-01-13 22:47 ` Russell King - ARM Linux
2012-01-13 23:33 ` David Brown
2012-01-13 23:26 ` David Brown
2012-01-13 23:29 ` Russell King - ARM Linux
2012-01-14 16:27 ` Marc Zyngier
2012-01-13 18:28 ` [PATCH v2 15/15] ARM: local timers: make the runtime registration interface mandatory Marc Zyngier
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=4F1080EB.1010909@gmail.com \
--to=robherring2@gmail$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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