mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Arnd Bergmann <arnd@arndb.de>
To: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>,
	Christian Daudt <csd@broadcom.com>,
	John Stultz <john.stultz@linaro.org>
Subject: [PATCH] clocksource: kona: adapt to CLOCKSOURCE_OF_DECLARE change
Date: Tue, 23 Apr 2013 17:54:35 +0200	[thread overview]
Message-ID: <1366732475-479886-5-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1366732475-479886-1-git-send-email-arnd@arndb.de>

The CLOCKSOURCE_OF_DECLARE functions now take a device_node pointer
as their argument, as of the clksrc/cleanup branch in arm-soc.
This patch adapts the bcm_kona_timer driver to the new interface.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Christian Daudt <csd@broadcom.com>
Cc: John Stultz <john.stultz@linaro.org>
---
 drivers/clocksource/bcm_kona_timer.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/drivers/clocksource/bcm_kona_timer.c b/drivers/clocksource/bcm_kona_timer.c
index 350f493..ba3d859 100644
--- a/drivers/clocksource/bcm_kona_timer.c
+++ b/drivers/clocksource/bcm_kona_timer.c
@@ -103,16 +103,10 @@ static const struct of_device_id bcm_timer_ids[] __initconst = {
 	{},
 };
 
-static void __init kona_timers_init(void)
+static void __init kona_timers_init(struct device_node *node)
 {
-	struct device_node *node;
 	u32 freq;
 
-	node = of_find_matching_node(NULL, bcm_timer_ids);
-
-	if (!node)
-		panic("No timer");
-
 	if (!of_property_read_u32(node, "clock-frequency", &freq))
 		arch_timer_rate = freq;
 	else
@@ -199,13 +193,12 @@ static struct irqaction kona_timer_irq = {
 	.handler = kona_timer_interrupt,
 };
 
-static void __init kona_timer_init(void)
+static void __init kona_timer_init(struct device_node *node)
 {
-	kona_timers_init();
+	kona_timers_init(node);
 	kona_timer_clockevents_init();
 	setup_irq(timers.tmr_irq, &kona_timer_irq);
 	kona_timer_set_next_event((arch_timer_rate / HZ), NULL);
 }
 
-CLOCKSOURCE_OF_DECLARE(bcm_kona, "bcm,kona-timer",
-	kona_timer_init);
+CLOCKSOURCE_OF_DECLARE(bcm_kona, "bcm,kona-timer", kona_timer_init);
-- 
1.8.1.2


  parent reply	other threads:[~2013-04-23 15:54 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-23 15:54 [PATCH] ARM: allmodconfig regressions in linux-next Arnd Bergmann
2013-04-23 15:54 ` [PATCH] usb: phy: phy core cannot yet be a module Arnd Bergmann
2013-04-23 16:07   ` Felipe Balbi
2013-04-23 16:11     ` Arnd Bergmann
2013-04-23 16:12       ` Felipe Balbi
2013-04-23 16:26     ` Greg Kroah-Hartman
2013-04-23 15:54 ` [PATCH] ASoC: don't call of_dma_request_slave_channel directly Arnd Bergmann
2013-04-23 15:56   ` Mark Brown
2013-04-24  1:11   ` Shawn Guo
2013-04-24 12:52     ` Arnd Bergmann
2013-04-23 15:54 ` [PATCH] hwrng: bcm2835: fix MODULE_LICENSE tag Arnd Bergmann
2013-06-18 16:57   ` Lubomir Rintel
2013-04-23 15:54 ` Arnd Bergmann [this message]
2013-04-26 15:42   ` [PATCH] clocksource: kona: adapt to CLOCKSOURCE_OF_DECLARE change 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=1366732475-479886-5-git-send-email-arnd@arndb.de \
    --to=arnd@arndb.de \
    --cc=csd@broadcom.com \
    --cc=john.stultz@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.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 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®