From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: Andrew Bresticker <abrestic@chromium.org>,
Ralf Baechle <ralf@linux-mips.org>,
Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Kumar Gala <galak@codeaurora.org>,
Thomas Gleixner <tglx@linutronix.de>,
Jason Cooper <jason@lakedaemon.net>
Cc: John Crispin <blogic@openwrt.org>,
David Daney <ddaney.cavm@gmail.com>,
Qais Yousef <qais.yousef@imgtec.com>,
James Hogan <james.hogan@imgtec.com>,
Arnd Bergmann <arnd@arndb.de>,
linux-mips@linux-mips.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH V5 4/4] clocksource: mips-gic: Add device-tree support
Date: Mon, 17 Nov 2014 22:21:46 +0100 [thread overview]
Message-ID: <546A66EA.3090107@linaro.org> (raw)
In-Reply-To: <1415821419-26974-5-git-send-email-abrestic@chromium.org>
On 11/12/2014 08:43 PM, Andrew Bresticker wrote:
> Parse the GIC timer frequency and interrupt from the device-tree.
>
> Signed-off-by: Andrew Bresticker <abrestic@chromium.org>
> Acked-by: Arnd Bergmann <arnd@arndb.de>
Hi Andrew,
through which tree is this patch supposed to go ?
Is there any dependency ?
> ---
> Changes from v4:
> - don't probe from irqchip; just warn if DT is wrong
> Changes from v3:
> - probe from GIC irqchip
> New for v3.
> ---
> drivers/clocksource/Kconfig | 1 +
> drivers/clocksource/mips-gic-timer.c | 41 ++++++++++++++++++++++++++++++------
> 2 files changed, 35 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
> index cb7e7f4..89836dc 100644
> --- a/drivers/clocksource/Kconfig
> +++ b/drivers/clocksource/Kconfig
> @@ -226,5 +226,6 @@ config CLKSRC_VERSATILE
> config CLKSRC_MIPS_GIC
> bool
> depends on MIPS_GIC
> + select CLKSRC_OF
>
> endmenu
> diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mips-gic-timer.c
> index a749c81..3bd31b1 100644
> --- a/drivers/clocksource/mips-gic-timer.c
> +++ b/drivers/clocksource/mips-gic-timer.c
> @@ -11,6 +11,7 @@
> #include <linux/interrupt.h>
> #include <linux/irqchip/mips-gic.h>
> #include <linux/notifier.h>
> +#include <linux/of_irq.h>
> #include <linux/percpu.h>
> #include <linux/smp.h>
> #include <linux/time.h>
> @@ -101,8 +102,6 @@ static int gic_clockevent_init(void)
> if (!cpu_has_counter || !gic_frequency)
> return -ENXIO;
>
> - gic_timer_irq = MIPS_GIC_IRQ_BASE +
> - GIC_LOCAL_TO_HWIRQ(GIC_LOCAL_INT_COMPARE);
> setup_percpu_irq(gic_timer_irq, &gic_compare_irqaction);
>
> register_cpu_notifier(&gic_cpu_nb);
> @@ -123,17 +122,45 @@ static struct clocksource gic_clocksource = {
> .flags = CLOCK_SOURCE_IS_CONTINUOUS,
> };
>
> -void __init gic_clocksource_init(unsigned int frequency)
> +static void __init __gic_clocksource_init(void)
> {
> - gic_frequency = frequency;
> -
> /* Set clocksource mask. */
> gic_clocksource.mask = CLOCKSOURCE_MASK(gic_get_count_width());
>
> /* Calculate a somewhat reasonable rating value. */
> - gic_clocksource.rating = 200 + frequency / 10000000;
> + gic_clocksource.rating = 200 + gic_frequency / 10000000;
>
> - clocksource_register_hz(&gic_clocksource, frequency);
> + clocksource_register_hz(&gic_clocksource, gic_frequency);
>
> gic_clockevent_init();
> }
> +
> +void __init gic_clocksource_init(unsigned int frequency)
> +{
> + gic_frequency = frequency;
> + gic_timer_irq = MIPS_GIC_IRQ_BASE +
> + GIC_LOCAL_TO_HWIRQ(GIC_LOCAL_INT_COMPARE);
> +
> + __gic_clocksource_init();
> +}
> +
> +static void __init gic_clocksource_of_init(struct device_node *node)
> +{
> + if (WARN_ON(!gic_present || !node->parent ||
> + !of_device_is_compatible(node->parent, "mti,gic")))
> + return;
> +
> + if (of_property_read_u32(node, "clock-frequency", &gic_frequency)) {
> + pr_err("GIC frequency not specified.\n");
> + return;
> + }
> + gic_timer_irq = irq_of_parse_and_map(node, 0);
> + if (!gic_timer_irq) {
> + pr_err("GIC timer IRQ not specified.\n");
> + return;
> + }
> +
> + __gic_clocksource_init();
> +}
> +CLOCKSOURCE_OF_DECLARE(mips_gic_timer, "mti,gic-timer",
> + gic_clocksource_of_init);
>
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
next prev parent reply other threads:[~2014-11-17 21:21 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-12 19:43 [PATCH V5 0/4] MIPS: GIC device-tree support Andrew Bresticker
2014-11-12 19:43 ` [PATCH V5 1/4] of: Add vendor prefix for MIPS Technologies, Inc Andrew Bresticker
2014-11-14 11:25 ` Ralf Baechle
2014-11-12 19:43 ` [PATCH V5 2/4] of: Add binding document for MIPS GIC Andrew Bresticker
2014-11-14 11:30 ` Ralf Baechle
2014-11-12 19:43 ` [PATCH V5 3/4] irqchip: mips-gic: Add device-tree support Andrew Bresticker
2014-11-12 19:43 ` [PATCH V5 4/4] clocksource: " Andrew Bresticker
2014-11-17 21:21 ` Daniel Lezcano [this message]
2014-11-17 21:26 ` Andrew Bresticker
2014-11-17 21:29 ` Daniel Lezcano
2014-11-17 21:28 ` Daniel Lezcano
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=546A66EA.3090107@linaro.org \
--to=daniel.lezcano@linaro.org \
--cc=abrestic@chromium.org \
--cc=arnd@arndb.de \
--cc=blogic@openwrt.org \
--cc=ddaney.cavm@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=galak@codeaurora.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=james.hogan@imgtec.com \
--cc=jason@lakedaemon.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=mark.rutland@arm.com \
--cc=pawel.moll@arm.com \
--cc=qais.yousef@imgtec.com \
--cc=ralf@linux-mips.org \
--cc=robh+dt@kernel.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;
as well as URLs for NNTP newsgroup(s).