From patchwork Tue Aug 30 20:52:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Joachim Eastwood X-Patchwork-Id: 9306025 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 70B3B607F0 for ; Tue, 30 Aug 2016 20:55:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 617F928D23 for ; Tue, 30 Aug 2016 20:55:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5649928D2B; Tue, 30 Aug 2016 20:55:43 +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=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EB4E528D23 for ; Tue, 30 Aug 2016 20:55:42 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1beq2y-0001eF-AW; Tue, 30 Aug 2016 20:54:16 +0000 Received: from mail-lf0-x241.google.com ([2a00:1450:4010:c07::241]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1beq2N-0001Y9-HE for linux-arm-kernel@lists.infradead.org; Tue, 30 Aug 2016 20:53:41 +0000 Received: by mail-lf0-x241.google.com with SMTP id 33so1475835lfw.3 for ; Tue, 30 Aug 2016 13:53:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hIasiAJLaKfNnerkaRm9uOM/gf1jsx8h0R9aHaDla7w=; b=r7eSLFxOiJUfFGdBuhpPJB8fJCgaBiXrZP4dXuux0C2QcCBEbL+3NyQLJSBGKH8QD2 bT/VtAUz/MCK80N5sePIiyrfm092uJ5gLTrbn8Hs3pqNyBlG0qnC7p5dfdvIDIQZ9dZb 7zA+Y7su+NTQQIAZ8BcrKyUb0N/QIf/ebm7weJWn/9ARgdeE4bh+t1vCYjmO+4uTuCLO VTjMx9wWT1BgusruWoP2hn+Cklz96gCvkubctqOUEPz8dcCJ1P0UX22x+aVvaoWuPWm/ VZkfFSXNaCbSK/XPXCC2ZNgxGUzcC0QlbzX1Q1McCUnJ+cbvBByk8VQTsTEEaRNtaVXb L+tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hIasiAJLaKfNnerkaRm9uOM/gf1jsx8h0R9aHaDla7w=; b=CoNd4MWa8+rRZZeM4Skag9iy6y4gkGpy3tPqGd9J+6crfwDaNub8pRl4SXXtqcuOmO UmouPFlVD2QovYb9h35noI2uIvPyJvSdRirmL1RMSxsRSrGWQf9MDbRGUAJBnzhxiOIT rn2vVL64sqU901qHbXuIafQQamDsUa51CZngkv0gTkdHeiOqU/O6VSDEhBBOIZU7AwCx LdZau6YWP6BEudWqTuYFkPiRPXcL+K4S0U8KIRcQ3AXnmnoZjfcOtzWLxI4hme+InxpI ptuaKkp2q/xn2vJGUnN29VwynHmdRQYj170tMXlCH3oqhzG8zxoRWUTDeBXkAarkW2sn 4m+w== X-Gm-Message-State: AE9vXwMopOgwGpHAvpEZ0ntuXw1tiVwNMPNkT7ty9Ma1EDRjFuumWoZUqsC7+T7pEASRJg== X-Received: by 10.25.23.210 with SMTP id 79mr2212646lfx.200.1472590396686; Tue, 30 Aug 2016 13:53:16 -0700 (PDT) Received: from archthink.lan ([89.11.254.244]) by smtp.gmail.com with ESMTPSA id 83sm7842926ljj.14.2016.08.30.13.53.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Aug 2016 13:53:16 -0700 (PDT) From: Joachim Eastwood To: stefan@agner.ch, mcoquelin.stm32@gmail.com, vladimir.murzin@arm.com, u.kleine-koenig@pengutronix.de Subject: [PATCH 1/3] ARM: dts: armv7-m: remove skeleton.dtsi include Date: Tue, 30 Aug 2016 22:52:48 +0200 Message-Id: <20160830205250.15616-2-manabian@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160830205250.15616-1-manabian@gmail.com> References: <20160830205250.15616-1-manabian@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160830_135339_860133_11954CF9 X-CRM114-Status: GOOD ( 12.58 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Joachim Eastwood , robh+dt@kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Remove skeleton.dtsi from the common ARM Cortex-M dtsi. This will allow us to remove skeleton.dtsi on a per platform basis and get rid of the unit address warning on the memory nodes without getting duplicate memory nodes. See 3ebee5a2e141 ("arm64: dts: kill skeleton.dtsi") for additional reasons not to use the skeleton.dtsi. Signed-off-by: Joachim Eastwood Acked-by: Stefan Agner Acked-by: Uwe Kleine-König Acked-by: Alexandre TORGUE --- arch/arm/boot/dts/armv7-m.dtsi | 2 -- arch/arm/boot/dts/efm32gg.dtsi | 2 ++ arch/arm/boot/dts/lpc18xx.dtsi | 1 + arch/arm/boot/dts/mps2.dtsi | 1 + arch/arm/boot/dts/stm32f429.dtsi | 1 + arch/arm/boot/dts/vf610m4.dtsi | 1 + 6 files changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/armv7-m.dtsi b/arch/arm/boot/dts/armv7-m.dtsi index 16331aa..ba332e3 100644 --- a/arch/arm/boot/dts/armv7-m.dtsi +++ b/arch/arm/boot/dts/armv7-m.dtsi @@ -1,5 +1,3 @@ -#include "skeleton.dtsi" - / { nvic: interrupt-controller@e000e100 { compatible = "arm,armv7m-nvic"; diff --git a/arch/arm/boot/dts/efm32gg.dtsi b/arch/arm/boot/dts/efm32gg.dtsi index c747983..d9dbf7f 100644 --- a/arch/arm/boot/dts/efm32gg.dtsi +++ b/arch/arm/boot/dts/efm32gg.dtsi @@ -4,6 +4,8 @@ * Documentation available from * http://www.silabs.com/Support%20Documents/TechnicalDocs/EFM32GG-RM.pdf */ + +#include "skeleton.dtsi" #include "armv7-m.dtsi" #include "dt-bindings/clock/efm32-cmu.h" diff --git a/arch/arm/boot/dts/lpc18xx.dtsi b/arch/arm/boot/dts/lpc18xx.dtsi index 1cd39fd..a1ecfe3 100644 --- a/arch/arm/boot/dts/lpc18xx.dtsi +++ b/arch/arm/boot/dts/lpc18xx.dtsi @@ -11,6 +11,7 @@ * */ +#include "skeleton.dtsi" #include "armv7-m.dtsi" #include "dt-bindings/clock/lpc18xx-cgu.h" diff --git a/arch/arm/boot/dts/mps2.dtsi b/arch/arm/boot/dts/mps2.dtsi index e3fed8d..efb8a03 100644 --- a/arch/arm/boot/dts/mps2.dtsi +++ b/arch/arm/boot/dts/mps2.dtsi @@ -42,6 +42,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#include "skeleton.dtsi" #include "armv7-m.dtsi" / { diff --git a/arch/arm/boot/dts/stm32f429.dtsi b/arch/arm/boot/dts/stm32f429.dtsi index 35df462..8e69328 100644 --- a/arch/arm/boot/dts/stm32f429.dtsi +++ b/arch/arm/boot/dts/stm32f429.dtsi @@ -45,6 +45,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#include "skeleton.dtsi" #include "armv7-m.dtsi" #include diff --git a/arch/arm/boot/dts/vf610m4.dtsi b/arch/arm/boot/dts/vf610m4.dtsi index 9ffe2eb..9f2c731 100644 --- a/arch/arm/boot/dts/vf610m4.dtsi +++ b/arch/arm/boot/dts/vf610m4.dtsi @@ -42,6 +42,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#include "skeleton.dtsi" #include "armv7-m.dtsi" #include "vfxxx.dtsi"