summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/imx7d-nitrogen7.dts
diff options
context:
space:
mode:
authorStefan Agner <stefan@agner.ch>2016-06-26 01:47:52 -0700
committerShawn Guo <shawnguo@kernel.org>2016-06-28 10:45:23 +0800
commit3ef79ca6bd1d6c79203f84c5cd876bcaa957f082 (patch)
treefecadbd1e6ba886f0f17e855720054a509f6493d /arch/arm/boot/dts/imx7d-nitrogen7.dts
parentd09e6beafa231c0fb160c3b2bd4c03bef8429a72 (diff)
downloadlinux-3ef79ca6bd1d6c79203f84c5cd876bcaa957f082.tar.bz2
ARM: dts: imx7d: use imx7s.dtsi as base device tree
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> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/imx7d-nitrogen7.dts')
-rw-r--r--arch/arm/boot/dts/imx7d-nitrogen7.dts2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx7d-nitrogen7.dts b/arch/arm/boot/dts/imx7d-nitrogen7.dts
index bef394ea3bd8..8e993cb02f45 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";