From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752156AbcFZIsh (ORCPT ); Sun, 26 Jun 2016 04:48:37 -0400 Received: from mail.kmu-office.ch ([178.209.48.109]:47481 "EHLO mail.kmu-office.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752069AbcFZIse (ORCPT ); Sun, 26 Jun 2016 04:48:34 -0400 From: Stefan Agner To: shawnguo@kernel.org, kernel@pengutronix.de Cc: max.krummenacher@toradex.com, marcel.ziswiler@toradex.com, fabio.estevam@nxp.com, galak@codeaurora.org, ijc+devicetree@hellion.org.uk, mark.rutland@arm.com, pawel.moll@arm.com, robh+dt@kernel.org, grinberg@compulab.co.il, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Stefan Agner Subject: [PATCH v2 2/5] ARM: dts: imx7d: use imx7s.dtsi as base device tree Date: Sun, 26 Jun 2016 01:47:52 -0700 Message-Id: <20160626084755.21925-3-stefan@agner.ch> X-Mailer: git-send-email 2.8.3 In-Reply-To: <20160626084755.21925-1-stefan@agner.ch> References: <20160626084755.21925-1-stefan@agner.ch> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The i.MX 7 series currently consists of two SoCs: i.MX 7Solo and 7Dual. The former has a subset of features of the latter, hence use imx7s.dtsi as the new base device tree. To keep diffstat nice, just move imx7d.dtsi to imx7s.dtsi temporarily and recreate imx7d.dtsi in a second commit. Signed-off-by: Stefan Agner --- arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 2 +- arch/arm/boot/dts/imx7d-nitrogen7.dts | 2 +- arch/arm/boot/dts/imx7d-sdb.dts | 2 +- arch/arm/boot/dts/{imx7d.dtsi => imx7s.dtsi} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename arch/arm/boot/dts/{imx7d.dtsi => imx7s.dtsi} (100%) diff --git a/arch/arm/boot/dts/imx7d-cl-som-imx7.dts b/arch/arm/boot/dts/imx7d-cl-som-imx7.dts index 4863451..3942c7d 100644 --- a/arch/arm/boot/dts/imx7d-cl-som-imx7.dts +++ b/arch/arm/boot/dts/imx7d-cl-som-imx7.dts @@ -13,7 +13,7 @@ /dts-v1/; #include -#include "imx7d.dtsi" +#include "imx7s.dtsi" / { model = "CompuLab CL-SOM-iMX7"; diff --git a/arch/arm/boot/dts/imx7d-nitrogen7.dts b/arch/arm/boot/dts/imx7d-nitrogen7.dts index bef394e..8e993cb 100644 --- a/arch/arm/boot/dts/imx7d-nitrogen7.dts +++ b/arch/arm/boot/dts/imx7d-nitrogen7.dts @@ -43,7 +43,7 @@ /dts-v1/; #include -#include "imx7d.dtsi" +#include "imx7s.dtsi" / { model = "Boundary Devices i.MX7 Nitrogen7 Board"; diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts index d6da506..1286569 100644 --- a/arch/arm/boot/dts/imx7d-sdb.dts +++ b/arch/arm/boot/dts/imx7d-sdb.dts @@ -43,7 +43,7 @@ /dts-v1/; #include -#include "imx7d.dtsi" +#include "imx7s.dtsi" / { model = "Freescale i.MX7 SabreSD Board"; diff --git a/arch/arm/boot/dts/imx7d.dtsi b/arch/arm/boot/dts/imx7s.dtsi similarity index 100% rename from arch/arm/boot/dts/imx7d.dtsi rename to arch/arm/boot/dts/imx7s.dtsi -- 2.8.3