diff options
| author | Stefan Agner <stefan@agner.ch> | 2016-06-26 11:47:52 +0300 |
|---|---|---|
| committer | Shawn Guo <shawnguo@kernel.org> | 2016-06-28 05:45:23 +0300 |
| commit | 3ef79ca6bd1d6c79203f84c5cd876bcaa957f082 (patch) | |
| tree | fecadbd1e6ba886f0f17e855720054a509f6493d | |
| parent | d09e6beafa231c0fb160c3b2bd4c03bef8429a72 (diff) | |
| download | linux-3ef79ca6bd1d6c79203f84c5cd876bcaa957f082.tar.xz | |
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>
| -rw-r--r-- | arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx7d-nitrogen7.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx7d-sdb.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx7s.dtsi (renamed from arch/arm/boot/dts/imx7d.dtsi) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/imx7d-cl-som-imx7.dts b/arch/arm/boot/dts/imx7d-cl-som-imx7.dts index 48634519d13a..3942c7d30321 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 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"; diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts index 6bd820367ad4..8852a84a91af 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 index 9f088a86bfeb..9f088a86bfeb 100644 --- a/arch/arm/boot/dts/imx7d.dtsi +++ b/arch/arm/boot/dts/imx7s.dtsi |