All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: Tim Kryger <tim.kryger@linaro.org>,
	Christian Daudt <bcm@fixthebug.org>,
	Rob Herring <rob.herring@calxeda.com>,
	Pawel Moll <pawel.moll@arm.com>,
	Mark Rutland <mark.rutland@arm.com>,
	Stephen Warren <swarren@wwwdotorg.org>,
	Ian Campbell <ijc+devicetree@hellion.org.uk>,
	Thomas Gleixner <tglx@linutronix.de>, Chris Ball <cjb@laptop.org>,
	Axel Lin <axel.lin@ingics.com>
Cc: Device Tree List <devicetree@vger.kernel.org>,
	Linux ARM Kernel List <linux-arm-kernel@lists.infradead.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux MMC List <linux-mmc@vger.kernel.org>,
	Linaro Patches List <patches@linaro.org>
Subject: Re: [PATCH v4 7/8] clocksource: kona: Add basic use of external clock
Date: Mon, 16 Dec 2013 11:34:38 +0100	[thread overview]
Message-ID: <52AED73E.5090507@linaro.org> (raw)
In-Reply-To: <1386271244-3927-8-git-send-email-tim.kryger@linaro.org>

On 12/05/2013 08:20 PM, Tim Kryger wrote:
> When an clock is specified in the device tree, enable it and use it to
> determine the external clock frequency.
>
> Signed-off-by: Tim Kryger <tim.kryger@linaro.org>
> Reviewed-by: Markus Mayer <markus.mayer@linaro.org>
> Reviewed-by: Matt Porter <matt.porter@linaro.org>

Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>

> ---
>   drivers/clocksource/bcm_kona_timer.c | 14 +++++++++++---
>   1 file changed, 11 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/clocksource/bcm_kona_timer.c b/drivers/clocksource/bcm_kona_timer.c
> index 0d7d8c3..8a4ab36 100644
> --- a/drivers/clocksource/bcm_kona_timer.c
> +++ b/drivers/clocksource/bcm_kona_timer.c
> @@ -17,6 +17,7 @@
>   #include <linux/jiffies.h>
>   #include <linux/clockchips.h>
>   #include <linux/types.h>
> +#include <linux/clk.h>
>
>   #include <linux/io.h>
>   #include <asm/mach/time.h>
> @@ -107,11 +108,18 @@ static const struct of_device_id bcm_timer_ids[] __initconst = {
>   static void __init kona_timers_init(struct device_node *node)
>   {
>   	u32 freq;
> +	struct clk *external_clk;
>
> -	if (!of_property_read_u32(node, "clock-frequency", &freq))
> +	external_clk = of_clk_get_by_name(node, NULL);
> +
> +	if (!IS_ERR(external_clk)) {
> +		arch_timer_rate = clk_get_rate(external_clk);
> +		clk_prepare_enable(external_clk);
> +	} else if (!of_property_read_u32(node, "clock-frequency", &freq)) {
>   		arch_timer_rate = freq;
> -	else
> -		panic("clock-frequency not set in the .dts file");
> +	} else {
> +		panic("unable to determine clock-frequency");
> +	}
>
>   	/* Setup IRQ numbers */
>   	timers.tmr_irq = irq_of_parse_and_map(node, 0);
>


-- 
  <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


WARNING: multiple messages have this Message-ID (diff)
From: daniel.lezcano@linaro.org (Daniel Lezcano)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 7/8] clocksource: kona: Add basic use of external clock
Date: Mon, 16 Dec 2013 11:34:38 +0100	[thread overview]
Message-ID: <52AED73E.5090507@linaro.org> (raw)
In-Reply-To: <1386271244-3927-8-git-send-email-tim.kryger@linaro.org>

On 12/05/2013 08:20 PM, Tim Kryger wrote:
> When an clock is specified in the device tree, enable it and use it to
> determine the external clock frequency.
>
> Signed-off-by: Tim Kryger <tim.kryger@linaro.org>
> Reviewed-by: Markus Mayer <markus.mayer@linaro.org>
> Reviewed-by: Matt Porter <matt.porter@linaro.org>

Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>

> ---
>   drivers/clocksource/bcm_kona_timer.c | 14 +++++++++++---
>   1 file changed, 11 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/clocksource/bcm_kona_timer.c b/drivers/clocksource/bcm_kona_timer.c
> index 0d7d8c3..8a4ab36 100644
> --- a/drivers/clocksource/bcm_kona_timer.c
> +++ b/drivers/clocksource/bcm_kona_timer.c
> @@ -17,6 +17,7 @@
>   #include <linux/jiffies.h>
>   #include <linux/clockchips.h>
>   #include <linux/types.h>
> +#include <linux/clk.h>
>
>   #include <linux/io.h>
>   #include <asm/mach/time.h>
> @@ -107,11 +108,18 @@ static const struct of_device_id bcm_timer_ids[] __initconst = {
>   static void __init kona_timers_init(struct device_node *node)
>   {
>   	u32 freq;
> +	struct clk *external_clk;
>
> -	if (!of_property_read_u32(node, "clock-frequency", &freq))
> +	external_clk = of_clk_get_by_name(node, NULL);
> +
> +	if (!IS_ERR(external_clk)) {
> +		arch_timer_rate = clk_get_rate(external_clk);
> +		clk_prepare_enable(external_clk);
> +	} else if (!of_property_read_u32(node, "clock-frequency", &freq)) {
>   		arch_timer_rate = freq;
> -	else
> -		panic("clock-frequency not set in the .dts file");
> +	} else {
> +		panic("unable to determine clock-frequency");
> +	}
>
>   	/* Setup IRQ numbers */
>   	timers.tmr_irq = irq_of_parse_and_map(node, 0);
>


-- 
  <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

  parent reply	other threads:[~2013-12-16 10:34 UTC|newest]

Thread overview: 60+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-05 19:20 [PATCH v4 0/8] Update Kona drivers to use clocks Tim Kryger
2013-12-05 19:20 ` Tim Kryger
2013-12-05 19:20 ` [PATCH v4 1/8] ARM: dts: Declare clocks as fixed on bcm11351 Tim Kryger
2013-12-05 19:20   ` Tim Kryger
2013-12-05 19:20   ` Tim Kryger
2013-12-10  7:18   ` Christian Daudt
2013-12-10  7:18     ` Christian Daudt
2013-12-10 20:26     ` Tim Kryger
2013-12-10 20:26       ` Tim Kryger
2013-12-13  7:48       ` Christian Daudt
2013-12-13  7:48         ` Christian Daudt
2013-12-13 15:56         ` Tim Kryger
2013-12-13 15:56           ` Tim Kryger
2013-12-05 19:20 ` [PATCH v4 2/8] ARM: dts: Specify clocks for UARTs " Tim Kryger
2013-12-05 19:20   ` Tim Kryger
2013-12-05 19:20   ` Tim Kryger
2013-12-13  7:56   ` Christian Daudt
2013-12-13  7:56     ` Christian Daudt
2013-12-05 19:20 ` [PATCH v4 3/8] Documentation: dt: kona-sdhci: Add clocks property Tim Kryger
2013-12-05 19:20   ` Tim Kryger
2013-12-05 19:20   ` Tim Kryger
2013-12-13  8:02   ` Christian Daudt
2013-12-13  8:02     ` Christian Daudt
2013-12-05 19:20 ` [PATCH v4 4/8] ARM: dts: Specify clocks for SDHCIs on bcm11351 Tim Kryger
2013-12-05 19:20   ` Tim Kryger
2013-12-05 19:20   ` Tim Kryger
2013-12-13  8:22   ` Christian Daudt
2013-12-13  8:22     ` Christian Daudt
2013-12-05 19:20 ` [PATCH v4 5/8] mmc: sdhci-bcm-kona: Add basic use of clocks Tim Kryger
2013-12-05 19:20   ` Tim Kryger
2013-12-14  8:14   ` Christian Daudt
2013-12-14  8:14     ` Christian Daudt
2013-12-14  8:14     ` Christian Daudt
2013-12-23  8:26     ` Christian Daudt
2013-12-23  8:26       ` Christian Daudt
2014-01-07 19:37     ` Tim Kryger
2014-01-07 19:37       ` Tim Kryger
2014-01-24 17:07       ` Tim Kryger
2014-01-24 17:07         ` Tim Kryger
2014-02-24 19:33         ` Matt Porter
2014-02-24 19:33           ` Matt Porter
2014-02-24 19:40           ` Chris Ball
2014-02-24 19:40             ` Chris Ball
2013-12-05 19:20 ` [PATCH v4 6/8] Documentation: dt: kona-timer: Add clocks property Tim Kryger
2013-12-05 19:20   ` Tim Kryger
2013-12-05 19:20   ` Tim Kryger
2013-12-14  8:19   ` Christian Daudt
2013-12-14  8:19     ` Christian Daudt
2013-12-05 19:20 ` [PATCH v4 7/8] clocksource: kona: Add basic use of external clock Tim Kryger
2013-12-05 19:20   ` Tim Kryger
2013-12-05 19:20   ` Tim Kryger
2013-12-14  8:26   ` Christian Daudt
2013-12-14  8:26     ` Christian Daudt
2013-12-16 10:34   ` Daniel Lezcano [this message]
2013-12-16 10:34     ` Daniel Lezcano
2013-12-05 19:20 ` [PATCH v4 8/8] ARM: dts: Specify clocks for timer on bcm11351 Tim Kryger
2013-12-05 19:20   ` Tim Kryger
2013-12-05 19:20   ` Tim Kryger
2013-12-13  8:06   ` Christian Daudt
2013-12-13  8:06     ` Christian Daudt

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=52AED73E.5090507@linaro.org \
    --to=daniel.lezcano@linaro.org \
    --cc=axel.lin@ingics.com \
    --cc=bcm@fixthebug.org \
    --cc=cjb@laptop.org \
    --cc=devicetree@vger.kernel.org \
    --cc=ijc+devicetree@hellion.org.uk \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=patches@linaro.org \
    --cc=pawel.moll@arm.com \
    --cc=rob.herring@calxeda.com \
    --cc=swarren@wwwdotorg.org \
    --cc=tglx@linutronix.de \
    --cc=tim.kryger@linaro.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 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.