From patchwork Tue Apr 23 15:54:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2478561 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork2.kernel.org (Postfix) with ESMTP id 8C50BDF2E5 for ; Tue, 23 Apr 2013 16:00:27 +0000 (UTC) Received: from merlin.infradead.org ([205.233.59.134]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UUfdf-00029b-2P; Tue, 23 Apr 2013 16:00:15 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UUfYZ-0004Zt-Su; Tue, 23 Apr 2013 15:54:59 +0000 Received: from moutng.kundenserver.de ([212.227.126.187]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UUfYF-0004Xe-6C for linux-arm-kernel@lists.infradead.org; Tue, 23 Apr 2013 15:54:40 +0000 Received: from wuerfel.lan (HSI-KBW-095-208-002-043.hsi5.kabel-badenwuerttemberg.de [95.208.2.43]) by mrelayeu.kundenserver.de (node=mreu1) with ESMTP (Nemesis) id 0MPbr3-1UQYwb3vwv-004P9U; Tue, 23 Apr 2013 17:54:33 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] clocksource: kona: adapt to CLOCKSOURCE_OF_DECLARE change Date: Tue, 23 Apr 2013 17:54:35 +0200 Message-Id: <1366732475-479886-5-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1366732475-479886-1-git-send-email-arnd@arndb.de> References: <1366732475-479886-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:lRRaOTBgeO46rGB9pj3clrYk0KLV2Dt2ngCPA1wFXZN AaGRUm5FPiueV5bC2zRVONc4+0ENAxcSh7M9YalEMw3G5CdB0J UaH+hYVC0/aSTFwyuuBJ9uLZ5/7QHGg+Oit85EtA6I6/mCK30v bkjj4MNJSMRwZXS7jWzG0u2u+ePx8cnK5Qd7wjuIkXGgPGw3Om LTcQbB58wsulejpJQCaMEeuw90wgQYpq3FfdCiT1HTcbc9tWGI PizRGts+Vvi3uvsOG1cHrfJCYojh6yLuxK7zGJTMYpReD1G0hK blXoHiVqq3/EF6KzaFmop+HwL+0iTnwt/oii8zWVUVU6k9HDyc EkvfY9yAUTXjF6RIpjogVHkqfwLhUrmB+syIOsX9z X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130423_115439_562034_0032C288 X-CRM114-Status: GOOD ( 10.63 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.187 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Christian Daudt , John Stultz , linux-kernel@vger.kernel.org, Arnd Bergmann X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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 Cc: Christian Daudt Cc: John Stultz acked-by: Christian Daudt tested-by: Christian Daudt --- 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);