From patchwork Fri Apr 11 08:04:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 338417 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id AAEA414008B for ; Fri, 11 Apr 2014 18:08:38 +1000 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WYWTm-0001BE-SX; Fri, 11 Apr 2014 08:06:31 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WYWTb-0006pe-3H; Fri, 11 Apr 2014 08:06:19 +0000 Received: from bombadil.infradead.org ([2001:1868:205::9]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WYWSK-0006mu-JK for linux-arm-kernel@merlin.infradead.org; Fri, 11 Apr 2014 08:05:30 +0000 Received: from co9ehsobe005.messaging.microsoft.com ([207.46.163.28] helo=co9outboundpool.messaging.microsoft.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WYWSJ-0000rq-JH for linux-arm-kernel@lists.infradead.org; Fri, 11 Apr 2014 08:04:59 +0000 Received: from mail183-co9-R.bigfish.com (10.236.132.238) by CO9EHSOBE034.bigfish.com (10.236.130.97) with Microsoft SMTP Server id 14.1.225.22; Fri, 11 Apr 2014 08:04:08 +0000 Received: from mail183-co9 (localhost [127.0.0.1]) by mail183-co9-R.bigfish.com (Postfix) with ESMTP id 36A0218026B; Fri, 11 Apr 2014 08:04:08 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(zze0eahzz1f42h2148h1ee6h1de0h1fdah2073h2146h1202h1e76h2189h1d1ah1d2ah21bch1fc6h208chzz1de098h8275bh1de097hz2dh2a8h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1b2fh2222h224fh1fb3h1d0ch1d2eh1d3fh1dfeh1dffh1e23h1fe8h1ff5h2218h2216h226dh22d0h24afh2327h2336h2438h2461h2487h24d7h2516h2545h255eh25cch25f6h2605h268bh26d3h1155h) Received: from mail183-co9 (localhost.localdomain [127.0.0.1]) by mail183-co9 (MessageSwitch) id 1397203446138906_16313; Fri, 11 Apr 2014 08:04:06 +0000 (UTC) Received: from CO9EHSMHS025.bigfish.com (unknown [10.236.132.245]) by mail183-co9.bigfish.com (Postfix) with ESMTP id 1CBDA3C004A; Fri, 11 Apr 2014 08:04:06 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CO9EHSMHS025.bigfish.com (10.236.130.35) with Microsoft SMTP Server (TLS) id 14.16.227.3; Fri, 11 Apr 2014 08:04:06 +0000 Received: from az84smr01.freescale.net (10.64.34.197) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server (TLS) id 14.3.174.2; Fri, 11 Apr 2014 08:04:30 +0000 Received: from dragon.ap.freescale.net ([10.192.185.223]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id s3B84KHo002298; Fri, 11 Apr 2014 01:04:28 -0700 From: Shawn Guo To: Subject: [PATCH 3/4] ARM: dts: imx6: use of_clk_get_by_name() to retrieve fixed-clock Date: Fri, 11 Apr 2014 16:04:06 +0800 Message-ID: <1397203447-22965-4-git-send-email-shawn.guo@freescale.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1397203447-22965-1-git-send-email-shawn.guo@freescale.com> References: <1397203447-22965-1-git-send-email-shawn.guo@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% X-FOPE-CONNECTOR: Id%0$Dn%FREESCALE.MAIL.ONMICROSOFT.COM$RO%1$TLS%0$FQDN%$TlsDn% X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140411_010459_649299_83349B79 X-CRM114-Status: GOOD ( 11.48 ) X-Spam-Score: -1.6 (-) X-Spam-Report: SpamAssassin version 3.3.2 on bombadil.infradead.org summary: Content analysis details: (-1.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [207.46.163.28 listed in list.dnswl.org] 0.7 UNRESOLVED_TEMPLATE Headers contain an unresolved template Cc: devicetree@vger.kernel.org, Shawn Guo , kernel@pengutronix.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org With the dependencies of those fixed input clocks reflected in device tree, we now can just call of_clk_get_by_name() to retrieve the clocks. Signed-off-by: Shawn Guo --- arch/arm/mach-imx/clk-imx6q.c | 6 +++--- arch/arm/mach-imx/clk-imx6sl.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c index b0e7f9d..862c80e 100644 --- a/arch/arm/mach-imx/clk-imx6q.c +++ b/arch/arm/mach-imx/clk-imx6q.c @@ -148,9 +148,9 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) int ret; clk[dummy] = imx_clk_fixed("dummy", 0); - clk[ckil] = imx_obtain_fixed_clock("ckil", 0); - clk[ckih] = imx_obtain_fixed_clock("ckih1", 0); - clk[osc] = imx_obtain_fixed_clock("osc", 0); + clk[ckil] = of_clk_get_by_name(ccm_node, "ckil"); + clk[ckih] = of_clk_get_by_name(ccm_node, "ckih1"); + clk[osc] = of_clk_get_by_name(ccm_node, "osc"); np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-anatop"); base = of_iomap(np, 0); diff --git a/arch/arm/mach-imx/clk-imx6sl.c b/arch/arm/mach-imx/clk-imx6sl.c index f7073c07..397f01a 100644 --- a/arch/arm/mach-imx/clk-imx6sl.c +++ b/arch/arm/mach-imx/clk-imx6sl.c @@ -174,8 +174,8 @@ static void __init imx6sl_clocks_init(struct device_node *ccm_node) int ret; clks[IMX6SL_CLK_DUMMY] = imx_clk_fixed("dummy", 0); - clks[IMX6SL_CLK_CKIL] = imx_obtain_fixed_clock("ckil", 0); - clks[IMX6SL_CLK_OSC] = imx_obtain_fixed_clock("osc", 0); + clks[IMX6SL_CLK_CKIL] = of_clk_get_by_name(ccm_node, "ckil"); + clks[IMX6SL_CLK_OSC] = of_clk_get_by_name(ccm_node, "osc"); np = of_find_compatible_node(NULL, NULL, "fsl,imx6sl-anatop"); base = of_iomap(np, 0);