From: Andrew Bresticker <abrestic@chromium.org>
To: Ralf Baechle <ralf@linux-mips.org>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Thomas Gleixner <tglx@linutronix.de>,
Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Bresticker <abrestic@chromium.org>,
Paul Burton <paul.burton@imgtec.com>,
Qais Yousef <qais.yousef@imgtec.com>,
John Crispin <blogic@openwrt.org>,
linux-mips@linux-mips.org, linux-kernel@vger.kernel.org
Subject: [PATCH 14/19] clocksource: mips-gic: Move gic_frequency to clocksource driver
Date: Mon, 20 Oct 2014 12:04:01 -0700 [thread overview]
Message-ID: <1413831846-32100-15-git-send-email-abrestic@chromium.org> (raw)
In-Reply-To: <1413831846-32100-1-git-send-email-abrestic@chromium.org>
There's no reason for gic_frequency to be global any more and it
certainly doesn't belong in the GIC irqchip driver, so move it to
the GIC clocksource driver.
Signed-off-by: Andrew Bresticker <abrestic@chromium.org>
---
arch/mips/mti-malta/malta-time.c | 2 ++
drivers/clocksource/mips-gic-timer.c | 3 +++
drivers/irqchip/irq-mips-gic.c | 1 -
include/linux/irqchip/mips-gic.h | 1 -
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/mips/mti-malta/malta-time.c b/arch/mips/mti-malta/malta-time.c
index 028fae0..ce02dbd 100644
--- a/arch/mips/mti-malta/malta-time.c
+++ b/arch/mips/mti-malta/malta-time.c
@@ -46,6 +46,8 @@ static int mips_cpu_timer_irq;
static int mips_cpu_perf_irq;
extern int cp0_perfcount_irq;
+static unsigned int gic_frequency;
+
static void mips_timer_dispatch(void)
{
do_IRQ(mips_cpu_timer_irq);
diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c
index 2603f50..bced17d 100644
--- a/drivers/clocksource/mips-gic-timer.c
+++ b/drivers/clocksource/mips-gic-timer.c
@@ -17,6 +17,7 @@
static DEFINE_PER_CPU(struct clock_event_device, gic_clockevent_device);
static int gic_timer_irq_installed;
+static unsigned int gic_frequency;
static int gic_next_event(unsigned long delta, struct clock_event_device *evt)
{
@@ -112,6 +113,8 @@ static struct clocksource gic_clocksource = {
void __init gic_clocksource_init(unsigned int frequency)
{
+ gic_frequency = frequency;
+
/* Set clocksource mask. */
gic_clocksource.mask = CLOCKSOURCE_MASK(gic_get_count_width());
diff --git a/drivers/irqchip/irq-mips-gic.c b/drivers/irqchip/irq-mips-gic.c
index 5c856e6..2949a9c 100644
--- a/drivers/irqchip/irq-mips-gic.c
+++ b/drivers/irqchip/irq-mips-gic.c
@@ -18,7 +18,6 @@
#include <asm/setup.h>
#include <asm/traps.h>
-unsigned int gic_frequency;
unsigned int gic_present;
struct gic_pcpu_mask {
diff --git a/include/linux/irqchip/mips-gic.h b/include/linux/irqchip/mips-gic.h
index 0350eff..420f77b 100644
--- a/include/linux/irqchip/mips-gic.h
+++ b/include/linux/irqchip/mips-gic.h
@@ -230,7 +230,6 @@
#define GIC_HWIRQ_TO_SHARED(x) ((x) - GIC_SHARED_HWIRQ_BASE)
extern unsigned int gic_present;
-extern unsigned int gic_frequency;
extern void gic_init(unsigned long gic_base_addr,
unsigned long gic_addrspace_size, unsigned int cpu_vec,
--
2.1.0.rc2.206.gedb03e5
next prev parent reply other threads:[~2014-10-20 19:05 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-20 19:03 [PATCH 00/19] MIPS GIC cleanup, part 2 Andrew Bresticker
2014-10-20 19:03 ` [PATCH 01/19] MIPS: Malta: Use gic_read_count() to read GIC timer Andrew Bresticker
2014-10-20 19:03 ` [PATCH 02/19] irqchip: mips-gic: Export function to read counter width Andrew Bresticker
2014-10-20 19:03 ` [PATCH 03/19] MIPS: sead3: Stop using GIC REG macros Andrew Bresticker
2014-10-22 9:33 ` Qais Yousef
2014-10-22 18:01 ` Andrew Bresticker
2014-10-20 19:03 ` [PATCH 04/19] MIPS: Malta: " Andrew Bresticker
2014-10-20 19:03 ` [PATCH 05/19] irqchip: mips-gic: Use proper iomem accessors Andrew Bresticker
2014-10-20 19:03 ` [PATCH 06/19] MIPS: Move gic.h to include/linux/irqchip/mips-gic.h Andrew Bresticker
2014-10-20 19:03 ` [PATCH 07/19] irqchip: mips-gic: Clean up header file Andrew Bresticker
2014-10-20 19:03 ` [PATCH 08/19] irqchip: mips-gic: Clean up #includes Andrew Bresticker
2014-10-20 19:03 ` [PATCH 09/19] irqchip: mips-gic: Remove gic_{pending,itrmask}_regs Andrew Bresticker
2014-10-20 19:03 ` [PATCH 10/19] irqchip: mips-gic: Use GIC_SH_WEDGE_{SET,CLR} macros Andrew Bresticker
2014-10-20 19:03 ` [PATCH 11/19] MIPS: Move GIC clocksource driver to drivers/clocksource/ Andrew Bresticker
2014-10-20 19:03 ` [PATCH 12/19] clocksource: mips-gic: Combine with GIC clockevent driver Andrew Bresticker
2014-10-20 19:04 ` [PATCH 13/19] clocksource: mips-gic: Staticize local symbols Andrew Bresticker
2014-10-20 19:04 ` Andrew Bresticker [this message]
2014-10-20 19:04 ` [PATCH 15/19] clocksource: mips-gic: Remove gic_event_handler Andrew Bresticker
2014-10-20 19:04 ` [PATCH 16/19] clocksource: mips-gic: Use percpu_dev_id Andrew Bresticker
2014-10-20 19:04 ` [PATCH 17/19] clocksource: mips-gic: Use CPU notifiers to setup the timer Andrew Bresticker
2014-10-20 19:04 ` [PATCH 18/19] clocksource: mips-gic: Use clockevents_config_and_register Andrew Bresticker
2014-10-20 19:04 ` [PATCH 19/19] clocksource: mips-gic: Bump up rating of GIC timer Andrew Bresticker
2014-10-22 11:03 ` [PATCH 00/19] MIPS GIC cleanup, part 2 Qais Yousef
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=1413831846-32100-15-git-send-email-abrestic@chromium.org \
--to=abrestic@chromium.org \
--cc=blogic@openwrt.org \
--cc=daniel.lezcano@linaro.org \
--cc=jason@lakedaemon.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=paul.burton@imgtec.com \
--cc=qais.yousef@imgtec.com \
--cc=ralf@linux-mips.org \
--cc=tglx@linutronix.de \
/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
all inboxes | Powered by JetHome®