From patchwork Fri Aug 9 22:35:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dinh Nguyen X-Patchwork-Id: 2842162 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 60229BF546 for ; Fri, 9 Aug 2013 22:35:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 379CC20114 for ; Fri, 9 Aug 2013 22:35:37 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C0BF3200F8 for ; Fri, 9 Aug 2013 22:35:35 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V7vHR-0004fw-1T; Fri, 09 Aug 2013 22:35:33 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V7vHO-0002CZ-Qh; Fri, 09 Aug 2013 22:35:30 +0000 Received: from va3ehsobe003.messaging.microsoft.com ([216.32.180.13] helo=va3outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V7vHL-0002Bm-Uc for linux-arm-kernel@lists.infradead.org; Fri, 09 Aug 2013 22:35:28 +0000 Received: from mail149-va3-R.bigfish.com (10.7.14.225) by VA3EHSOBE008.bigfish.com (10.7.40.28) with Microsoft SMTP Server id 14.1.225.22; Fri, 9 Aug 2013 22:35:01 +0000 Received: from mail149-va3 (localhost [127.0.0.1]) by mail149-va3-R.bigfish.com (Postfix) with ESMTP id 38CAB60197; Fri, 9 Aug 2013 22:35:01 +0000 (UTC) X-Forefront-Antispam-Report: CIP:66.35.236.232; KIP:(null); UIP:(null); IPV:NLI; H:SJ-ITEXEDGE02.altera.priv.altera.com; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(zzzz1f42h208ch1ee6h1de0h1fdah2073h1202h1e76h1d1ah1d2ah1fc6hzz1de098h8275bh8275dh1de097hz2fh2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h14ddh1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1d0ch1d2eh1d3fh1dc1h1dfeh1dffh1e1dh1e23h1fe8h1155h) Received-SPF: pass (mail149-va3: domain of altera.com designates 66.35.236.232 as permitted sender) client-ip=66.35.236.232; envelope-from=dinguyen@altera.com; helo=SJ-ITEXEDGE02.altera.priv.altera.com ; v.altera.com ; Received: from mail149-va3 (localhost.localdomain [127.0.0.1]) by mail149-va3 (MessageSwitch) id 1376087700568615_996; Fri, 9 Aug 2013 22:35:00 +0000 (UTC) Received: from VA3EHSMHS009.bigfish.com (unknown [10.7.14.237]) by mail149-va3.bigfish.com (Postfix) with ESMTP id 86012340041; Fri, 9 Aug 2013 22:35:00 +0000 (UTC) Received: from SJ-ITEXEDGE02.altera.priv.altera.com (66.35.236.232) by VA3EHSMHS009.bigfish.com (10.7.99.19) with Microsoft SMTP Server (TLS) id 14.16.227.3; Fri, 9 Aug 2013 22:35:00 +0000 Received: from sj-mail01.altera.com (137.57.1.6) by SJ-ITEXEDGE02.altera.priv.altera.com (66.35.236.232) with Microsoft SMTP Server id 8.3.298.1; Fri, 9 Aug 2013 15:24:16 -0700 Received: from linux-builds1.altera.com (linux-builds1.altera.com [137.57.188.121]) by sj-mail01.altera.com (8.13.7+Sun/8.13.7) with ESMTP id r79MYvai006461; Fri, 9 Aug 2013 15:34:58 -0700 (PDT) From: To: Subject: [RFC PATCH] ARM: smp_twd: Fix twd_get_clock() to get clock from dts or clock framework Date: Fri, 9 Aug 2013 17:35:19 -0500 Message-ID: <1376087720-14539-1-git-send-email-dinguyen@altera.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-OriginatorOrg: altera.com X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130809_183528_108237_B8A3B25C X-CRM114-Status: GOOD ( 11.47 ) X-Spam-Score: -2.6 (--) Cc: Russell King , Arnd Bergmann , Linus Walleij , spear-devel@list.st.com, Rob Herring , Viresh Kumar , linux-arm-kernel@lists.infradead.org, Dinh Nguyen 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Dinh Nguyen Some platforms have a clock for the smp_twd that goes through a fixed divider. Registering this smp_twd clocks is done by calling clk_register_fixed_factor(). Fix up twd_get_clock() so that it can get the clock from the device tree node or clk_register_fixed_factor(). Signed-off-by: Dinh Nguyen Cc: Viresh Kumar Cc: Linus Walleij Cc: Rob Herring Cc: Arnd Bergmann CC: Russell King Cc: spear-devel@list.st.com Cc: linux-arm-kernel@lists.infradead.org --- arch/arm/kernel/smp_twd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c index 2595620..643b226 100644 --- a/arch/arm/kernel/smp_twd.c +++ b/arch/arm/kernel/smp_twd.c @@ -244,7 +244,10 @@ static void twd_get_clock(struct device_node *np) if (np) twd_clk = of_clk_get(np, 0); - else + + /* Some platforms do not register the smp_twd clock in the device */ + /* node of the twd timer. */ + if (IS_ERR(twd_clk)) twd_clk = clk_get_sys("smp_twd", NULL); if (IS_ERR(twd_clk)) {