From patchwork Wed Apr 3 16:13:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2388651 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 A6F5DDFB79 for ; Wed, 3 Apr 2013 16:23:25 +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 1UNQT6-0001Jl-Sd for patchwork-linux-arm@patchwork.kernel.org; Wed, 03 Apr 2013 16:23:25 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UNQKN-0001et-Ep; Wed, 03 Apr 2013 16:14:24 +0000 Received: from moutng.kundenserver.de ([212.227.17.9]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UNQK0-0001ZS-81 for linux-arm-kernel@lists.infradead.org; Wed, 03 Apr 2013 16:14:02 +0000 Received: from axis700.grange (dslb-094-221-105-117.pools.arcor-ip.net [94.221.105.117]) by mrelayeu.kundenserver.de (node=mreu3) with ESMTP (Nemesis) id 0LoNd0-1Uqhfb1T0k-00gUUD; Wed, 03 Apr 2013 18:13:57 +0200 Received: from 6a.grange (6a.grange [192.168.1.11]) by axis700.grange (Postfix) with ESMTPS id E33C240BB3; Wed, 3 Apr 2013 18:13:56 +0200 (CEST) Received: from lyakh by 6a.grange with local (Exim 4.72) (envelope-from ) id 1UNQJw-0004ZF-Ja; Wed, 03 Apr 2013 18:13:56 +0200 From: Guennadi Liakhovetski To: linux-sh@vger.kernel.org Subject: [PATCH 1/3] ARM: also support TWD clock, instantiated from platform data Date: Wed, 3 Apr 2013 18:13:54 +0200 Message-Id: <1365005636-17526-2-git-send-email-g.liakhovetski@gmx.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1365005636-17526-1-git-send-email-g.liakhovetski@gmx.de> References: <1365005636-17526-1-git-send-email-g.liakhovetski@gmx.de> X-Provags-ID: V02:K0:MBf0ROiRHmLnYbYMQu+xE/0o8n4cXWoi3v0lxrXupif HQBHXlDt0NdfMgjcKNEw4FgSzhdHpnE5fDdl9OtNAGIv46gqXj U23Mynq7Po3zfICx8nWmY4/4pd9KisXttaIZMzxdvcVBk4as2w 1N6zKlpY/snABFRFH0f5zb1GiDpI2lzWbmxnbuqS4l0o2KibJs EcqgDXKKZokUnRvj4VPMF0Tbn6kBRPVELzPp9umr3AjNsMP5ho TLGOuiXm0gdHGLzxnoLBdbCUTnmhAdZQEyQ7e8/opAxtX6vKlt 5XvxISqzz304npEzcya1hhMpxYmpgBocvo3Do5xMW5PSoa6aVy l5+j0Qd0vS3CQ4uc9gw0dwxpigiIGyf1851Xd2F87+yJap1izn aTS6kki0kgzvQ== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130403_121400_747825_0E610F63 X-CRM114-Status: GOOD ( 11.34 ) X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.17.9 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (g.liakhovetski[at]gmx.de) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -2.3 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Guennadi Liakhovetski , Simon Horman , Magnus Damm , linux-arm-kernel@lists.infradead.org, Russell King 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 While gradually switching clock initialisation to DT some architectures can have TWD device in DT, but supplying clock initialised from platform data. This patch adds support for such configurations to ARM. Signed-off-by: Guennadi Liakhovetski Cc: Russell King Acked-by: Simon Horman --- arch/arm/kernel/smp_twd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c index 3f25650..8f12aa3 100644 --- a/arch/arm/kernel/smp_twd.c +++ b/arch/arm/kernel/smp_twd.c @@ -244,7 +244,7 @@ static void twd_get_clock(struct device_node *np) if (np) twd_clk = of_clk_get(np, 0); - else + if (IS_ERR(twd_clk)) twd_clk = clk_get_sys("smp_twd", NULL); if (IS_ERR(twd_clk)) {