From patchwork Fri Apr 4 23:14:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soren Brinkmann X-Patchwork-Id: 3941431 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6A4329F357 for ; Fri, 4 Apr 2014 23:16:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7D6A1202A1 for ; Fri, 4 Apr 2014 23:16:14 +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 6C5E520265 for ; Fri, 4 Apr 2014 23:16:13 +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 1WWDKY-0005Qy-Jw; Fri, 04 Apr 2014 23:15:27 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WWDKN-0001nf-QP; Fri, 04 Apr 2014 23:15:15 +0000 Received: from mail-qc0-x22c.google.com ([2607:f8b0:400d:c01::22c]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WWDKH-0001kk-9k for linux-arm-kernel@lists.infradead.org; Fri, 04 Apr 2014 23:15:11 +0000 Received: by mail-qc0-f172.google.com with SMTP id i8so4262061qcq.31 for ; Fri, 04 Apr 2014 16:14:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=mY3oT7BTaNpXAQPFkgmaqNq8NCl00D6Xg6qr3RXH7C4=; b=AP2QbNoQUKHaG631mawRlMBzPGtuS2qbgVAVp0yBw9Y7rwAxFLiYwTjKKrZvmFkzg9 Mpd17V1Qo+OnVovAa+NVY/wBKKXY2SfTzk3S6UEyaY70+FHyTQsbjf05OObNkULDhlOz 0KQrNMLMWrm4TX27Dl/pMHkCSsbrWvYURFhpjIj8CxqvCD/5na6UAB0BCNyJPOIiiiFf pLDJlq3P83Ncfmt61ECALb7P11SQv3oBEixLfLn0ldzf9q1lMkEefNtYlenZ0Qwsxbq5 TtTHy9YbzRNu3duvH7OGF1k1XCfn8OKLGWqT83SNC7gFeXK15VQsqYXjYBRGpGWtdXtt MYWQ== X-Received: by 10.224.132.5 with SMTP id z5mr41016qas.101.1396653284749; Fri, 04 Apr 2014 16:14:44 -0700 (PDT) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id a17sm18937215qac.35.2014.04.04.16.14.42 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 04 Apr 2014 16:14:42 -0700 (PDT) From: Soren Brinkmann To: Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Russell King , Michal Simek Subject: [PATCH v2 2/5] ARM: zynq: dt: Convert to preprocessor includes Date: Fri, 4 Apr 2014 16:14:13 -0700 Message-Id: <1396653256-28397-3-git-send-email-soren.brinkmann@xilinx.com> X-Mailer: git-send-email 1.9.1.1.gbb9f595 In-Reply-To: <1396653256-28397-1-git-send-email-soren.brinkmann@xilinx.com> References: <1396653256-28397-1-git-send-email-soren.brinkmann@xilinx.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140404_191509_437671_B10CCB7C X-CRM114-Status: UNSURE ( 9.93 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) Cc: devicetree@vger.kernel.org, Mike Looijmans , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Steffen Trumtrar , =?UTF-8?q?S=C3=B6ren=20Brinkmann?= 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.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 Convert all Zynq DT files to the dtc preprocessor include syntax. This allows to include header files in the devicetrees like other SoC-types already do. Inspired-by: Steffen Trumtrar (http://www.spinics.net/lists/arm-kernel/msg319832.html) Signed-off-by: Soren Brinkmann --- Changes in v2: None arch/arm/boot/dts/zynq-7000.dtsi | 3 ++- arch/arm/boot/dts/zynq-zc702.dts | 2 +- arch/arm/boot/dts/zynq-zc706.dts | 2 +- arch/arm/boot/dts/zynq-zed.dts | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi index 20a13cba65a3..66613d04de5d 100644 --- a/arch/arm/boot/dts/zynq-7000.dtsi +++ b/arch/arm/boot/dts/zynq-7000.dtsi @@ -10,7 +10,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ -/include/ "skeleton.dtsi" + +#include "skeleton.dtsi" / { compatible = "xlnx,zynq-7000"; diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts index c913f77a21eb..07713d3c716a 100644 --- a/arch/arm/boot/dts/zynq-zc702.dts +++ b/arch/arm/boot/dts/zynq-zc702.dts @@ -12,7 +12,7 @@ * GNU General Public License for more details. */ /dts-v1/; -/include/ "zynq-7000.dtsi" +#include "zynq-7000.dtsi" / { model = "Zynq ZC702 Development Board"; diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts index 88f62c50382e..cf6566cdb02a 100644 --- a/arch/arm/boot/dts/zynq-zc706.dts +++ b/arch/arm/boot/dts/zynq-zc706.dts @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ /dts-v1/; -/include/ "zynq-7000.dtsi" +#include "zynq-7000.dtsi" / { model = "Zynq ZC706 Development Board"; diff --git a/arch/arm/boot/dts/zynq-zed.dts b/arch/arm/boot/dts/zynq-zed.dts index 82d7ef1a9a9c..1541716e2cfb 100644 --- a/arch/arm/boot/dts/zynq-zed.dts +++ b/arch/arm/boot/dts/zynq-zed.dts @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ /dts-v1/; -/include/ "zynq-7000.dtsi" +#include "zynq-7000.dtsi" / { model = "Zynq Zed Development Board";