From: Arnd Bergmann <arnd@arndb.de>
To: arm@kernel.org, Tony Lindgren <tony@atomide.com>
Cc: Arnd Bergmann <arnd@arndb.de>,
Grygorii Strashko <grygorii.strashko@ti.com>,
Keerthy <j-keerthy@ti.com>, Lokesh Vutla <lokeshvutla@ti.com>,
Rob Herring <robh@kernel.org>, Tero Kristo <t-kristo@ti.com>,
Santosh Shilimkar <santosh.shilimkar@oracle.com>,
Olof Johansson <olof@lixom.net>,
Geert Uytterhoeven <geert+renesas@glider.be>,
afzal mohammed <afzal.mohd.ma@gmail.com>,
linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] ARM: omap2: drop broken broadcast timer hack
Date: Thu, 28 May 2020 11:19:12 +0200 [thread overview]
Message-ID: <20200528091923.2951100-1-arnd@arndb.de> (raw)
The OMAP4 timer code had a special hack for using the broadcast timer
without SMP. Since the dmtimer is now gone, this also needs to be dropped
to avoid a link failure for non-SMP AM43xx configurations:
kernel/time/tick-broadcast.o: in function `tick_device_uses_broadcast':
tick-broadcast.c:(.text+0x130): undefined reference to `tick_broadcast'
Fixes: 2ee04b88547a ("ARM: OMAP2+: Drop old timer code for dmtimer and 32k counter")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm/mach-omap2/Kconfig | 1 -
arch/arm/mach-omap2/timer.c | 6 ------
2 files changed, 7 deletions(-)
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index ca74473f01df..ec4450a5c296 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -67,7 +67,6 @@ config SOC_AM43XX
select ARM_GIC
select MACH_OMAP_GENERIC
select HAVE_ARM_SCU
- select GENERIC_CLOCKEVENTS_BROADCAST
select HAVE_ARM_TWD
select ARM_ERRATA_754322
select ARM_ERRATA_775420
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index 2d4ea386fc38..786336ee27ef 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -46,12 +46,6 @@ void set_cntfreq(void)
omap_smc1(OMAP5_DRA7_MON_SET_CNTFRQ_INDEX, arch_timer_freq);
}
-#if !defined(CONFIG_SMP) && defined(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST)
-void tick_broadcast(const struct cpumask *mask)
-{
-}
-#endif
-
#if defined(CONFIG_SOC_OMAP5) || defined(CONFIG_SOC_DRA7XX)
/*
--
2.26.2
next reply other threads:[~2020-05-28 9:19 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-28 9:19 Arnd Bergmann [this message]
2020-05-28 13:46 ` [PATCH] ARM: omap2: drop broken broadcast timer hack Tony Lindgren
2020-05-28 13:50 ` Tony Lindgren
2020-05-28 15:57 ` Tony Lindgren
2020-05-28 16:18 ` santosh.shilimkar
2020-05-28 20:33 ` Arnd Bergmann
2020-05-28 20:38 ` 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=20200528091923.2951100-1-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=afzal.mohd.ma@gmail.com \
--cc=arm@kernel.org \
--cc=geert+renesas@glider.be \
--cc=grygorii.strashko@ti.com \
--cc=j-keerthy@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=lokeshvutla@ti.com \
--cc=olof@lixom.net \
--cc=robh@kernel.org \
--cc=santosh.shilimkar@oracle.com \
--cc=t-kristo@ti.com \
--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: 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).