From: Felipe Balbi <balbi@ti.com> To: Tony Lindgren <tony@atomide.com> Cc: Linux OMAP Mailing List <linux-omap@vger.kernel.org>, Felipe Balbi <balbi@ti.com>, Linux ARM Kernel Mailing List <linux-arm-kernel@lists.infradead.org> Subject: [PATCH 01/11] arm: omap2: timer: always define omap4_local_timer_init Date: Fri, 16 Oct 2015 11:22:00 -0500 [thread overview] Message-ID: <1445012530-14126-2-git-send-email-balbi@ti.com> (raw) In-Reply-To: <1445012530-14126-1-git-send-email-balbi@ti.com> omap4_local_timer_init() can be used by other platforms as is. At least AM437x wants to use it. Instead of making omap4-only and providing a stub for builds without OMAP4, we can just make sure that function is always available for all SoCs that need it. Reported-by: Nishanth Menon <nm@ti.com> Signed-off-by: Felipe Balbi <balbi@ti.com> --- arch/arm/mach-omap2/timer.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index a55655127ef2..548d922cb107 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -630,32 +630,22 @@ OMAP_SYS_32K_TIMER_INIT(3_secure, 12, "secure_32k_fck", "ti,timer-secure", 2, "timer_sys_ck", NULL); #endif /* CONFIG_ARCH_OMAP3 */ -#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM33XX) || \ - defined(CONFIG_SOC_AM43XX) +#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM33XX) OMAP_SYS_GP_TIMER_INIT(3, 2, "timer_sys_ck", NULL, 1, "timer_sys_ck", "ti,timer-alwon"); #endif #if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) || \ - defined(CONFIG_SOC_DRA7XX) + defined(CONFIG_SOC_DRA7XX) || defined(CONFIG_SOC_AM43XX) static OMAP_SYS_32K_TIMER_INIT(4, 1, "timer_32k_ck", "ti,timer-alwon", 2, "sys_clkin_ck", NULL); -#endif -#ifdef CONFIG_ARCH_OMAP4 -#ifdef CONFIG_HAVE_ARM_TWD void __init omap4_local_timer_init(void) { omap4_sync32k_timer_init(); clocksource_of_init(); } -#else -void __init omap4_local_timer_init(void) -{ - omap4_sync32k_timer_init(); -} -#endif /* CONFIG_HAVE_ARM_TWD */ -#endif /* CONFIG_ARCH_OMAP4 */ +#endif #if defined(CONFIG_SOC_OMAP5) || defined(CONFIG_SOC_DRA7XX) void __init omap5_realtime_timer_init(void) -- 2.5.3
WARNING: multiple messages have this Message-ID (diff)
From: balbi@ti.com (Felipe Balbi) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 01/11] arm: omap2: timer: always define omap4_local_timer_init Date: Fri, 16 Oct 2015 11:22:00 -0500 [thread overview] Message-ID: <1445012530-14126-2-git-send-email-balbi@ti.com> (raw) In-Reply-To: <1445012530-14126-1-git-send-email-balbi@ti.com> omap4_local_timer_init() can be used by other platforms as is. At least AM437x wants to use it. Instead of making omap4-only and providing a stub for builds without OMAP4, we can just make sure that function is always available for all SoCs that need it. Reported-by: Nishanth Menon <nm@ti.com> Signed-off-by: Felipe Balbi <balbi@ti.com> --- arch/arm/mach-omap2/timer.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index a55655127ef2..548d922cb107 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -630,32 +630,22 @@ OMAP_SYS_32K_TIMER_INIT(3_secure, 12, "secure_32k_fck", "ti,timer-secure", 2, "timer_sys_ck", NULL); #endif /* CONFIG_ARCH_OMAP3 */ -#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM33XX) || \ - defined(CONFIG_SOC_AM43XX) +#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM33XX) OMAP_SYS_GP_TIMER_INIT(3, 2, "timer_sys_ck", NULL, 1, "timer_sys_ck", "ti,timer-alwon"); #endif #if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) || \ - defined(CONFIG_SOC_DRA7XX) + defined(CONFIG_SOC_DRA7XX) || defined(CONFIG_SOC_AM43XX) static OMAP_SYS_32K_TIMER_INIT(4, 1, "timer_32k_ck", "ti,timer-alwon", 2, "sys_clkin_ck", NULL); -#endif -#ifdef CONFIG_ARCH_OMAP4 -#ifdef CONFIG_HAVE_ARM_TWD void __init omap4_local_timer_init(void) { omap4_sync32k_timer_init(); clocksource_of_init(); } -#else -void __init omap4_local_timer_init(void) -{ - omap4_sync32k_timer_init(); -} -#endif /* CONFIG_HAVE_ARM_TWD */ -#endif /* CONFIG_ARCH_OMAP4 */ +#endif #if defined(CONFIG_SOC_OMAP5) || defined(CONFIG_SOC_DRA7XX) void __init omap5_realtime_timer_init(void) -- 2.5.3
next prev parent reply other threads:[~2015-10-16 16:22 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-10-16 16:21 [PATCH 00/11] arm: omap: timer cleanups Felipe Balbi 2015-10-16 16:21 ` Felipe Balbi 2015-10-16 16:22 ` Felipe Balbi [this message] 2015-10-16 16:22 ` [PATCH 01/11] arm: omap2: timer: always define omap4_local_timer_init Felipe Balbi 2015-10-16 16:22 ` [PATCH 02/11] arm: omap2: timer: get rid of obfuscating macros Felipe Balbi 2015-10-16 16:22 ` Felipe Balbi 2015-10-16 16:22 ` [PATCH 03/11] arm: omap2: timer: add a gptimer argument to sync32k_timer_init() Felipe Balbi 2015-10-16 16:22 ` Felipe Balbi 2015-10-16 16:22 ` [PATCH 04/11] arm: omap2: timer: remove __omap_gptimer_init() Felipe Balbi 2015-10-16 16:22 ` Felipe Balbi 2015-10-16 16:22 ` [PATCH 05/11] arm: omap2: timer: provide generic sync32k_timer_init function Felipe Balbi 2015-10-16 16:22 ` Felipe Balbi 2015-10-16 16:22 ` [PATCH 06/11] arm: omap2: timer: move realtime_counter_init() around Felipe Balbi 2015-10-16 16:22 ` Felipe Balbi 2015-10-16 16:22 ` [PATCH 07/11] arm: omap2: timer: always call clocksource_of_init() when DT Felipe Balbi 2015-10-16 16:22 ` Felipe Balbi 2015-10-16 16:22 ` [PATCH 08/11] arm: omap2: timer: rename omap_sync32k_timer_init() Felipe Balbi 2015-10-16 16:22 ` Felipe Balbi 2015-10-16 16:22 ` [PATCH 09/11] clocksource: add TI 32.768 Hz counter driver Felipe Balbi 2015-10-16 16:22 ` Felipe Balbi 2015-10-16 16:22 ` Felipe Balbi 2015-10-16 20:49 ` kbuild test robot 2015-10-16 20:49 ` kbuild test robot 2015-10-16 20:49 ` kbuild test robot 2015-10-16 21:10 ` [PATCH] clocksource: ti-32k: make it depend on GENERIC_CLOCKSOURCE Felipe Balbi 2015-10-16 21:10 ` Felipe Balbi 2015-10-16 21:29 ` Tony Lindgren 2015-10-16 21:29 ` Tony Lindgren 2015-10-16 16:22 ` [PATCH 10/11] arm: omap2+: select 32k clocksource driver Felipe Balbi 2015-10-16 16:22 ` Felipe Balbi 2015-10-16 16:22 ` [PATCH 11/11] arm: omap2: timer: limit hwmod usage to non-DT boots Felipe Balbi 2015-10-16 16:22 ` Felipe Balbi 2015-10-16 20:40 ` [PATCH 00/11] arm: omap: timer cleanups Tony Lindgren 2015-10-16 20:40 ` Tony Lindgren
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=1445012530-14126-2-git-send-email-balbi@ti.com \ --to=balbi@ti.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@vger.kernel.org \ --cc=tony@atomide.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.