From patchwork Thu Feb 14 19:54:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hiroshi DOYU X-Patchwork-Id: 2142871 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id E439CDF283 for ; Thu, 14 Feb 2013 19:57:32 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U64tb-0004eV-6l; Thu, 14 Feb 2013 19:55:03 +0000 Received: from hqemgate03.nvidia.com ([216.228.121.140]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1U64tY-0004dx-BD for linux-arm-kernel@lists.infradead.org; Thu, 14 Feb 2013 19:55:00 +0000 Received: from hqnvupgp05.nvidia.com (Not Verified[216.228.121.13]) by hqemgate03.nvidia.com id ; Thu, 14 Feb 2013 11:59:30 -0800 Received: from hqemhub03.nvidia.com ([172.17.108.22]) by hqnvupgp05.nvidia.com (PGP Universal service); Thu, 14 Feb 2013 11:54:48 -0800 X-PGP-Universal: processed; by hqnvupgp05.nvidia.com on Thu, 14 Feb 2013 11:54:48 -0800 Received: from hqnvemgw02.nvidia.com (172.16.227.111) by HQEMHUB03.nvidia.com (172.20.150.15) with Microsoft SMTP Server id 8.3.297.1; Thu, 14 Feb 2013 11:54:47 -0800 Received: from daphne.nvidia.com (Not Verified[172.16.212.96]) by hqnvemgw02.nvidia.com with MailMarshal (v6,7,2,8378) id ; Thu, 14 Feb 2013 11:54:47 -0800 Received: from oreo.Nvidia.com (dhcp-10-21-25-186.nvidia.com [10.21.25.186]) by daphne.nvidia.com (8.13.8+Sun/8.8.8) with ESMTP id r1EJsR3A006386; Thu, 14 Feb 2013 11:54:44 -0800 (PST) From: Hiroshi Doyu To: Subject: [PATCH 2/2] ARM: tegra114: convert device tree files to use CLK defines Date: Thu, 14 Feb 2013 21:54:01 +0200 Message-ID: <1360871650-25771-2-git-send-email-hdoyu@nvidia.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1360871650-25771-1-git-send-email-hdoyu@nvidia.com> References: <1360871650-25771-1-git-send-email-hdoyu@nvidia.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130214_145500_510329_610BF01F X-CRM114-Status: GOOD ( 11.81 ) X-Spam-Score: -4.6 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [216.228.121.140 listed in list.dnswl.org] 3.0 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.7 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: Prashant Gaikwad , Russell King , Stephen Warren , Simon Glass , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Rob Herring , Grant Likely , Rob Landley , linux-tegra@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, Hiroshi Doyu X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Replace magic number in tegra_car: - clocks = <&tegra_car 28>; + clocks = <&tegra_car CLK_HOST1X>; Signed-off-by: Hiroshi Doyu --- .../bindings/clock/nvidia,tegra114-car.txt | 2 +- arch/arm/boot/dts/tegra114.dtsip | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Documentation/devicetree/bindings/clock/nvidia,tegra114-car.txt b/Documentation/devicetree/bindings/clock/nvidia,tegra114-car.txt index 25e088d..be95f92 100644 --- a/Documentation/devicetree/bindings/clock/nvidia,tegra114-car.txt +++ b/Documentation/devicetree/bindings/clock/nvidia,tegra114-car.txt @@ -283,7 +283,7 @@ Example SoC include file: }; usb@c5004000 { - clocks = <&tegra_car 58>; /* usb2 */ + clocks = <&tegra_car CLK_USB2>; /* usb2 */ }; }; diff --git a/arch/arm/boot/dts/tegra114.dtsip b/arch/arm/boot/dts/tegra114.dtsip index df01b15..2afa559 100644 --- a/arch/arm/boot/dts/tegra114.dtsip +++ b/arch/arm/boot/dts/tegra114.dtsip @@ -1,6 +1,7 @@ #include "skeleton.dtsi" #include "tegra-gpio.h" #include "arm-gic.h" +#include "tegra114-car.h" / { compatible = "nvidia,tegra114"; @@ -27,7 +28,7 @@ , , ; - clocks = <&tegra_car 5>; + clocks = <&tegra_car CLK_TIMER>; }; tegra_car: clock { @@ -70,7 +71,7 @@ reg-shift = <2>; interrupts = ; status = "disabled"; - clocks = <&tegra_car 6>; + clocks = <&tegra_car CLK_UARTA>; }; serial@70006040 { @@ -79,7 +80,7 @@ reg-shift = <2>; interrupts = ; status = "disabled"; - clocks = <&tegra_car 192>; + clocks = <&tegra_car CLK_UARTB>; }; serial@70006200 { @@ -88,7 +89,7 @@ reg-shift = <2>; interrupts = ; status = "disabled"; - clocks = <&tegra_car 55>; + clocks = <&tegra_car CLK_UARTC>; }; serial@70006300 { @@ -97,14 +98,14 @@ reg-shift = <2>; interrupts = ; status = "disabled"; - clocks = <&tegra_car 65>; + clocks = <&tegra_car CLK_UARTD>; }; rtc { compatible = "nvidia,tegra114-rtc", "nvidia,tegra20-rtc"; reg = <0x7000e000 0x100>; interrupts = ; - clocks = <&tegra_car 4>; + clocks = <&tegra_car CLK_RTC>; }; pmc {