Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1431387

[PATCH v2 2/5] ARM: dts: imx7d: use imx7s.dtsi as base device tree

Show all headers | View raw

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 <stefan@agner.ch>
---
 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 <dt-bindings/input/input.h>
-#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 <dt-bindings/input/input.h>
-#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 <dt-bindings/input/input.h>
-#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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/5] ARM: dts: imx7d: add i.MX 7Solo and Colibri iMX7S/D dts Stefan Agner <stefan@agner.ch> - 2016-06-26 10:50 +0200
  [PATCH v2 1/5] ARM: imx: add support for i.MX 7Solo Stefan Agner <stefan@agner.ch> - 2016-06-26 10:50 +0200
  [PATCH v2 3/5] ARM: dts: imx7d: recreate imx7d.dtsi with i.MX 7Dual specifics Stefan Agner <stefan@agner.ch> - 2016-06-26 10:50 +0200
  [PATCH v2 2/5] ARM: dts: imx7d: use imx7s.dtsi as base device tree Stefan Agner <stefan@agner.ch> - 2016-06-26 10:50 +0200
  [PATCH v2 5/5] ARM: dts: imx7: add Toradex Colibri iMX7S/iMX7D support Stefan Agner <stefan@agner.ch> - 2016-06-26 10:50 +0200
  Re: [PATCH v2 0/5] ARM: dts: imx7d: add i.MX 7Solo and Colibri  iMX7S/D dts Shawn Guo <shawnguo@kernel.org> - 2016-06-28 04:50 +0200

csiph-web