From: santosh.shilimkar@ti.com (Santosh Shilimkar)
To: linux-arm-kernel@lists.infradead.org
Subject: [RFC PATCHv2 14/20] ARM: omap4: dynamically register local timersetup function
Date: Wed, 16 Mar 2011 11:25:10 +0530 [thread overview]
Message-ID: <f77caa44aa0205d3687b0dcae796c42b@mail.gmail.com> (raw)
In-Reply-To: <1300201983-26124-15-git-send-email-marc.zyngier@arm.com>
Marc,
> -----Original Message-----
> From: linux-arm-kernel-bounces at lists.infradead.org [mailto:linux-
> arm-kernel-bounces at lists.infradead.org] On Behalf Of Marc Zyngier
> Sent: Tuesday, March 15, 2011 8:43 PM
> To: linux-arm-kernel at lists.infradead.org
> Cc: Tony Lindgren
> Subject: [RFC PATCHv2 14/20] ARM: omap4: dynamically register local
> timersetup function
>
> Cc: Tony Lindgren <tony@atomide.com>
> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
> ---
> arch/arm/mach-omap2/Makefile | 1 -
> arch/arm/mach-omap2/timer-gp.c | 13 ++++++++++++-
> arch/arm/mach-omap2/timer-mpu.c | 36 ----------------------------
> --------
> 3 files changed, 12 insertions(+), 38 deletions(-)
> delete mode 100644 arch/arm/mach-omap2/timer-mpu.c
>
> diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-
> omap2/Makefile
> index a45cd64..41f8b67 100644
> --- a/arch/arm/mach-omap2/Makefile
> +++ b/arch/arm/mach-omap2/Makefile
> @@ -22,7 +22,6 @@ obj-$(CONFIG_TWL4030_CORE) += omap_twl.o
>
> # SMP support ONLY available for OMAP4
> obj-$(CONFIG_SMP) += omap-smp.o omap-headsmp.o
> -obj-$(CONFIG_LOCAL_TIMERS) += timer-mpu.o
> obj-$(CONFIG_HOTPLUG_CPU) += omap-hotplug.o
> obj-$(CONFIG_ARCH_OMAP4) += omap44xx-smc.o omap4-common.o
>
> diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-
> omap2/timer-gp.c
> index 3b9cf85..98d03c5 100644
> --- a/arch/arm/mach-omap2/timer-gp.c
> +++ b/arch/arm/mach-omap2/timer-gp.c
> @@ -39,6 +39,7 @@
> #include <asm/mach/time.h>
> #include <plat/dmtimer.h>
> #include <asm/localtimer.h>
> +#include <asm/smp_twd.h>
> #include <asm/sched_clock.h>
> #include <plat/common.h>
> #include <plat/omap_hwmod.h>
> @@ -247,12 +248,22 @@ static void __init
> omap2_gp_clocksource_init(void)
> }
> #endif
>
> +#ifdef CONFIG_LOCAL_TIMERS
> +static int __cpuinit omap4_local_timer_setup(struct
> clock_event_device *evt)
> +{
> + evt->irq = OMAP44XX_IRQ_LOCALTIMER;
> + return 0;
> +}
> +#endif
> +
> static void __init omap2_gp_timer_init(void)
> {
> #ifdef CONFIG_LOCAL_TIMERS
> - if (cpu_is_omap44xx()) {
> + if (cpu_is_omap44xx() && omap_rev() != OMAP4430_REV_ES1_0)
I see one problem here. The reason we changed the signature of
local_timer_setup() is in case where the local timer isn't
available on a specific SOC versions, the kernel will switch
to broad-cast timers.
This way the kernel built with CONFIG_LOCAL_TIMERS can still work
on SoCs where twd isn't supported.
Looks like your patch breaks that unless and until I am missing
something.
Regards,
Santosh
next prev parent reply other threads:[~2011-03-16 5:55 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-15 15:12 [RFC PATCHv2 00/20] A15 architected timer support Marc Zyngier
2011-03-15 15:12 ` [RFC PATCHv2 01/20] ARM: architected timers: move local timer support to percpu_timer.c Marc Zyngier
2011-03-15 15:12 ` [RFC PATCHv2 02/20] ARM: omap2: remove stubbed twd_timer_setup call Marc Zyngier
2011-03-15 15:12 ` [RFC PATCHv2 03/20] ARM: exynos4: " Marc Zyngier
2011-03-15 15:12 ` [RFC PATCHv2 04/20] ARM: shmobile: " Marc Zyngier
2011-03-15 15:12 ` [RFC PATCHv2 05/20] ARM: tegra: " Marc Zyngier
2011-03-15 15:12 ` [RFC PATCHv2 06/20] ARM: ux500: " Marc Zyngier
2011-03-15 15:12 ` [RFC PATCHv2 07/20] ARM: versatile: " Marc Zyngier
2011-03-15 15:12 ` [RFC PATCHv2 08/20] ARM: remove unused twd_timer_setup stub Marc Zyngier
2011-03-15 15:12 ` [RFC PATCHv2 09/20] ARM: architected timers: add A15 architected timers Marc Zyngier
2011-04-09 2:47 ` Stephen Boyd
2011-04-11 8:31 ` Marc Zyngier
2011-03-15 15:12 ` [RFC PATCHv2 10/20] ARM: Platform dependent sched_clock() override Marc Zyngier
2011-03-15 15:12 ` [RFC PATCHv2 11/20] ARM: architected timers: Add A15 specific sched_clock implementation Marc Zyngier
2011-03-15 15:12 ` [RFC PATCHv2 12/20] ARM: versatile/vexpress: rework timer support Marc Zyngier
2011-03-15 15:12 ` [RFC PATCHv2 13/20] ARM: msm: dynamically register local timer setup function Marc Zyngier
2011-03-15 15:12 ` [RFC PATCHv2 14/20] ARM: omap4: " Marc Zyngier
2011-03-16 5:55 ` Santosh Shilimkar [this message]
2011-03-16 10:03 ` [RFC PATCHv2 14/20] ARM: omap4: dynamically register local timersetup function Marc Zyngier
2011-03-17 10:12 ` Santosh Shilimkar
2011-03-15 15:12 ` [RFC PATCHv2 15/20] ARM: exynos4: dynamically register local timer setup function Marc Zyngier
2011-03-15 15:12 ` [RFC PATCHv2 16/20] ARM: shmobile: " Marc Zyngier
2011-03-15 15:13 ` [RFC PATCHv2 17/20] ARM: tegra: " Marc Zyngier
2011-03-15 15:13 ` [RFC PATCHv2 18/20] ARM: ux500: " Marc Zyngier
2011-03-15 15:13 ` [RFC PATCHv2 19/20] ARM: simplify percpu_timer_setup Marc Zyngier
2011-03-15 15:13 ` [RFC PATCHv2 20/20] ARM: simplify percpu_timer_ack 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=f77caa44aa0205d3687b0dcae796c42b@mail.gmail.com \
--to=santosh.shilimkar@ti.com \
--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).