From patchwork Sun Apr 6 19:38:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gilles Chanteperdrix X-Patchwork-Id: 3943681 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 6C06FBFF02 for ; Sun, 6 Apr 2014 19:39:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 777C4201EC for ; Sun, 6 Apr 2014 19:39:05 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0101F2016C for ; Sun, 6 Apr 2014 19:39:03 +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 1WWsts-0003vf-Bq; Sun, 06 Apr 2014 19:38:40 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WWstp-0006GD-VQ; Sun, 06 Apr 2014 19:38:37 +0000 Received: from sd-51317.dedibox.fr ([62.210.215.82]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WWstm-0006Fs-LP for linux-arm-kernel@lists.infradead.org; Sun, 06 Apr 2014 19:38:35 +0000 Received: from men13-3-82-231-18-196.fbx.proxad.net ([82.231.18.196] helo=prometheus.local) by sd-51317.dedibox.fr with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1WWstN-0001aO-Fs; Sun, 06 Apr 2014 21:38:09 +0200 From: Gilles Chanteperdrix To: Russell King , linux-arm-kernel@lists.infradead.org Subject: [PATCH] arm/twd: use smp_twd clock even with DT Date: Sun, 6 Apr 2014 21:38:05 +0200 Message-Id: <1396813085-15363-1-git-send-email-gilles.chanteperdrix@xenomai.org> X-Mailer: git-send-email 1.7.10.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140406_153834_840885_EC7B3762 X-CRM114-Status: UNSURE ( 8.91 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) Cc: Gilles Chanteperdrix 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 X-Spam-Status: No, score=-4.5 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 Booting Linux 3.14 on Pandaboard currently gets the following message displayed: smp_twd: clock not found -2 Whereas an "smp_twd" clock exists for omap4. The following change avoids this. Signed-off-by: Gilles Chanteperdrix --- arch/arm/kernel/smp_twd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c index 6591e26..67754af 100644 --- a/arch/arm/kernel/smp_twd.c +++ b/arch/arm/kernel/smp_twd.c @@ -246,7 +246,7 @@ static void twd_get_clock(struct device_node *np) if (np) twd_clk = of_clk_get(np, 0); - else + if (np == NULL || IS_ERR(twd_clk)) twd_clk = clk_get_sys("smp_twd", NULL); if (IS_ERR(twd_clk)) {