From patchwork Thu Jun 15 21:33:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 9790297 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 87B5C602CB for ; Thu, 15 Jun 2017 21:34:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7866027F9F for ; Thu, 15 Jun 2017 21:34:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6C5712848D; Thu, 15 Jun 2017 21:34:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E22C827F9F for ; Thu, 15 Jun 2017 21:34:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=IikQ/Waqif36VXyTegpSI+MJ2Xf/a0lvU2dgBzoFDmM=; b=FnBrrlifOyXK7As2JxiASUq/+Q Yr6SfpJzWZSHlborEnP5wC+R+KNj1o31iteQcCWFU4ks5/wmRs8OPKQbdj0uParuFMYKCRCB/fDjr LIhh5z9VM4zQGJJOnyD8Eog1XMSWRaLsSq/wAAnkENMoCW5DRxS/hWr+kq4gygrv0VjjnxjQZh8Up 6/s7Y+BF5EGn8zdl1metlfCjlwVoVfcBsLtsRuLuxX1cFtUUx5Ae4dliDkkS3xqD8lAJ/5Bt1GisG YqVgA89/qwijQpsB6N2DB9KOgpnWdMylbGQsLlZR3upE8CYdkiNcF8VigIIpfMLiYHvNfeXZens6T V9BRC85g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dLcPQ-0006yZ-6m; Thu, 15 Jun 2017 21:34:32 +0000 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dLcPN-0006v6-3B for linux-amlogic@lists.infradead.org; Thu, 15 Jun 2017 21:34:30 +0000 Received: by mail-wm0-x241.google.com with SMTP id d64so1830119wmf.2 for ; Thu, 15 Jun 2017 14:34:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nbqXxxXCDkHUQvbxqW0sF6kcmFxPfybziUnyRnH50Ns=; b=TEIZg2Sno2EGLV1mu0YGSwx7WisOtyqpqvov1leAHsXGEcJewihOSWjE3bmnEGtTRf 3wciRLTNYL7ReP3/Bxm3T+M9mVZEi2NvxbsypGsah3jTc15/lsUJ+ZpLfn+2vCNrXKOI n5efZu689eyVd54JK7winH1jf95xl65JDgg7ZEu7RD5okxn24IzQOaVR1MjyNlhXCHTR CvQmTQhj6Lua6oGSs+HRjWUbld5yt2+2vNULQ8V4mWBNmOyC28s37ivYNJ1Wo8A2RHk/ RSN7y6M9QP1MrKD33PViEB2nSFJNRJ5/uRo0PLiNAM9tx3nC3fL5JqCVpWbuxxXQc3wH 8wMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=nbqXxxXCDkHUQvbxqW0sF6kcmFxPfybziUnyRnH50Ns=; b=lYuAesvLqhq3OswKuSDMbZUOuV+FhC83xVzUvcUjRNgihj3kMuR4G2GTRP+/nYUUo8 +cn/00NAgm6Jqyn8RA+24WP4M0PhDO2y65kA1yOU+IcVQzr4w+RZzJRtineac3IdRNtM MiJfedRaVpEaZjR19pWGxkcWsrY4vorNkj8agAy8u819JkT0x0W2mMwRYfHCKbVE0Kuq gD8W1P0R9F90VkfndHheQu3ljQ08jJJd4CVoSuybx0clSUSil1tA4HuosILb33akcg0B p6llR83TmIZ8gOxm/Uria4oGOLCnFs+uoRl7u1GfUxzzLDWpHlmG3pVe9YpkLXllbpo/ 02fg== X-Gm-Message-State: AKS2vOxxpxRPxtqs2hpmu3UgLzNv9MLltnSPYZ2UJNYa3CTo4+43u+Yt uREnMKV+cHRwAjxNBB4= X-Received: by 10.28.69.91 with SMTP id s88mr5057200wma.104.1497562446133; Thu, 15 Jun 2017 14:34:06 -0700 (PDT) Received: from blackbox.darklights.net (p200300DCD3D2E00439AFAA47B57A3DE2.dip0.t-ipconnect.de. [2003:dc:d3d2:e004:39af:aa47:b57a:3de2]) by smtp.googlemail.com with ESMTPSA id a28sm423575wra.17.2017.06.15.14.34.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Jun 2017 14:34:05 -0700 (PDT) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org, narmstrong@baylibre.com, khilman@baylibre.com, carlo@caione.org Subject: [PATCH v2 01/10] ARM: dts: meson: use C preprocessor friendly include syntax Date: Thu, 15 Jun 2017 23:33:43 +0200 Message-Id: <20170615213352.25134-2-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20170615213352.25134-1-martin.blumenstingl@googlemail.com> References: <20170611101644.28581-1-martin.blumenstingl@googlemail.com> <20170615213352.25134-1-martin.blumenstingl@googlemail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170615_143429_317988_1BDDEEEC X-CRM114-Status: UNSURE ( 8.76 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Martin Blumenstingl , devicetree@vger.kernel.org, mturquette@baylibre.com, linux@armlinux.org.uk, jbrunet@baylibre.com MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This replaces the "/include/" syntax with the "#include" syntax in all Amlogic Meson .dts and .dtsi files. That is required to use preprocessor defines (like GIC_SPI and IRQ_TYPE_EDGE_RISING) in meson.dtsi (all files which directly or indirectly include meson.dtsi need to use the "#include" syntax, otherwise the .dts files cannot be compiled). Signed-off-by: Martin Blumenstingl --- arch/arm/boot/dts/meson6-atv1200.dts | 2 +- arch/arm/boot/dts/meson6.dtsi | 2 +- arch/arm/boot/dts/meson8.dtsi | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/meson6-atv1200.dts b/arch/arm/boot/dts/meson6-atv1200.dts index 1237faa63ce6..9444b0d9628f 100644 --- a/arch/arm/boot/dts/meson6-atv1200.dts +++ b/arch/arm/boot/dts/meson6-atv1200.dts @@ -46,7 +46,7 @@ */ /dts-v1/; -/include/ "meson6.dtsi" +#include "meson6.dtsi" / { model = "Geniatech ATV1200"; diff --git a/arch/arm/boot/dts/meson6.dtsi b/arch/arm/boot/dts/meson6.dtsi index b0fc91ffd6a1..8557b6117a4b 100644 --- a/arch/arm/boot/dts/meson6.dtsi +++ b/arch/arm/boot/dts/meson6.dtsi @@ -45,7 +45,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -/include/ "meson.dtsi" +#include "meson.dtsi" / { model = "Amlogic Meson6 SoC"; diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi index e4f7357b4b31..c5d73b999773 100644 --- a/arch/arm/boot/dts/meson8.dtsi +++ b/arch/arm/boot/dts/meson8.dtsi @@ -45,7 +45,7 @@ #include #include -/include/ "meson.dtsi" +#include "meson.dtsi" / { model = "Amlogic Meson8 SoC";