From patchwork Fri Apr 11 08:04:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 3966501 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 42F25BFF02 for ; Fri, 11 Apr 2014 08:07:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5BAD420588 for ; Fri, 11 Apr 2014 08:07:56 +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 5E9AA2052D for ; Fri, 11 Apr 2014 08:07:55 +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 1WYWTk-000194-1m; Fri, 11 Apr 2014 08:06:28 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WYWTW-0006pG-9m; Fri, 11 Apr 2014 08:06:15 +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-0006mt-9d for linux-arm-kernel@merlin.infradead.org; Fri, 11 Apr 2014 08:05:00 +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 1WYWSI-0000rm-Tn for linux-arm-kernel@lists.infradead.org; Fri, 11 Apr 2014 08:04:59 +0000 Received: from mail90-co9-R.bigfish.com (10.236.132.237) by CO9EHSOBE020.bigfish.com (10.236.130.83) with Microsoft SMTP Server id 14.1.225.22; Fri, 11 Apr 2014 08:04:11 +0000 Received: from mail90-co9 (localhost [127.0.0.1]) by mail90-co9-R.bigfish.com (Postfix) with ESMTP id 703007401AD; Fri, 11 Apr 2014 08:04:11 +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: 5 X-BigFish: VS5(z1039mzzz1f42h2148h1ee6h1de0h1fdah2073h2146h1202h1e76h2189h1d1ah1d2ah21bch1fc6h208chzz1de098h8275bh1de097hz2dh2a8h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1b2fh2222h224fh1fb3h1d0ch1d2eh1d3fh1dfeh1dffh1e23h1fe8h1ff5h2218h2216h226dh22d0h24afh2327h2336h2438h2461h2487h24d7h2516h2545h255eh25cch25f6h2605h268bh26d3h1155h) Received: from mail90-co9 (localhost.localdomain [127.0.0.1]) by mail90-co9 (MessageSwitch) id 1397203448788504_11213; Fri, 11 Apr 2014 08:04:08 +0000 (UTC) Received: from CO9EHSMHS018.bigfish.com (unknown [10.236.132.227]) by mail90-co9.bigfish.com (Postfix) with ESMTP id B133A9C0046; Fri, 11 Apr 2014 08:04:08 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CO9EHSMHS018.bigfish.com (10.236.130.28) with Microsoft SMTP Server (TLS) id 14.16.227.3; Fri, 11 Apr 2014 08:04:08 +0000 Received: from az84smr01.freescale.net (10.64.34.197) by 039-SN1MMR1-001.039d.mgd.msft.net (10.84.1.13) with Microsoft SMTP Server (TLS) id 14.3.174.2; Fri, 11 Apr 2014 08:04:32 +0000 Received: from dragon.ap.freescale.net ([10.192.185.223]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id s3B84KHp002298; Fri, 11 Apr 2014 01:04:30 -0700 From: Shawn Guo To: Subject: [PATCH 4/4] ARM: dts: imx6: use generic name for fixed-clock nodes Date: Fri, 11 Apr 2014 16:04:07 +0800 Message-ID: <1397203447-22965-5-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_002441_244CF523 X-CRM114-Status: GOOD ( 12.42 ) X-Spam-Score: -1.6 (-) 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-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=-3.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD,UNPARSEABLE_RELAY,UNRESOLVED_TEMPLATE autolearn=ham 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 Per device tree spec, we should use generic name for device node when possible. Let's do that for the fixed-clock nodes, and use property clock-output-names to define the name for clock. While at it, let's drop those unneeded imx specific compatible string for these fixed rate clocks. Signed-off-by: Shawn Guo --- arch/arm/boot/dts/imx6qdl.dtsi | 18 ++++++++++++------ arch/arm/boot/dts/imx6sl.dtsi | 8 ++++++-- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi index 2a35b08..400f75c 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi @@ -57,22 +57,28 @@ #address-cells = <1>; #size-cells = <0>; - ckil: ckil { - compatible = "fsl,imx-ckil", "fixed-clock"; + ckil: clock@0 { + compatible = "fixed-clock"; + reg = <0>; #clock-cells = <0>; clock-frequency = <32768>; + clock-output-names = "ckil"; }; - ckih1: ckih1 { - compatible = "fsl,imx-ckih1", "fixed-clock"; + ckih1: clock@1 { + compatible = "fixed-clock"; + reg = <1>; #clock-cells = <0>; clock-frequency = <0>; + clock-output-names = "ckih1"; }; - osc: osc { - compatible = "fsl,imx-osc", "fixed-clock"; + osc: clock@2 { + compatible = "fixed-clock"; + reg = <2>; #clock-cells = <0>; clock-frequency = <24000000>; + clock-output-names = "osc"; }; }; diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi index a6d3afb..275eb30 100644 --- a/arch/arm/boot/dts/imx6sl.dtsi +++ b/arch/arm/boot/dts/imx6sl.dtsi @@ -79,16 +79,20 @@ #address-cells = <1>; #size-cells = <0>; - ckil: ckil { + ckil: clock@0 { compatible = "fixed-clock"; + reg = <0>; #clock-cells = <0>; clock-frequency = <32768>; + clock-output-names = "ckil"; }; - osc: osc { + osc: clock@1 { compatible = "fixed-clock"; + reg = <1>; #clock-cells = <0>; clock-frequency = <24000000>; + clock-output-names = "osc"; }; };