MLK-10645: ARM: imx7d: rename arm2 dts files to match board variant

* Rename mx7d arm2 evaluation board dts file to match
  DEFAULT_FDT_FILE name expected by uboot
* DTS file name follows the naming convention:
  <soc>-<package>-<ddr>-<target>.dts
  imx7d-12x12-lpddr3-arm2.dts
  imx7d-19x19-ddr3-arm2.dts
* Update Makefile rules to build dtb files

Signed-off-by: Adrian Alonso <aalonso@freescale.com>
(cherry picked from commit e9807ee8a76157e1da0fc12fa9c5ab8e57a5cb90)

Conflicts:
	arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-sim.dts

11 files changed, 19 insertions, 19 deletions

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 8f821f2f1f89..ab0da2c295ee 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -211,13 +211,13 @@ dtb-$(CONFIG_ARCH_MXC) += \
 	imx6sx-sdb-emmc.dtb \
 	imx6sx-sdb-m4.dtb \
 	vf610-twr.dtb \
-	imx7d-12x12-arm2.dtb \
-	imx7d-12x12-arm2-enet.dtb \
-	imx7d-12x12-arm2-flexcan.dtb \
-	imx7d-12x12-arm2-qspi.dtb \
-	imx7d-12x12-arm2-m4.dtb \
-	imx7d-19x19-arm2.dtb \
-	imx7d-19x19-arm2-csi.dtb \
+	imx7d-12x12-lpddr3-arm2.dtb \
+	imx7d-12x12-lpddr3-arm2-enet.dtb \
+	imx7d-12x12-lpddr3-arm2-flexcan.dtb \
+	imx7d-12x12-lpddr3-arm2-qspi.dtb \
+	imx7d-12x12-lpddr3-arm2-m4.dtb \
+	imx7d-19x19-ddr3-arm2.dtb \
+	imx7d-19x19-ddr3-arm2-csi.dtb \
 	imx7d-sdb.dtb \
 	imx7d-sdb-enet.dtb \
 	imx7d-sdb-epdc.dtb \
diff --git a/arch/arm/boot/dts/imx7d-12x12-arm2-enet.dts b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-enet.dts
index 0ce14f1f7e18..151853dc1712 100644
--- a/arch/arm/boot/dts/imx7d-12x12-arm2-enet.dts
+++ b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-enet.dts
@@ -6,7 +6,7 @@
  * published by the Free Software Foundation.
  */
 
-#include "imx7d-12x12-arm2.dts"
+#include "imx7d-12x12-lpddr3-arm2.dts"
 
 &epdc {
         status = "disabled";
diff --git a/arch/arm/boot/dts/imx7d-12x12-arm2-flexcan.dts b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-flexcan.dts
index 0c032360eb4a..469c7d5eaac9 100644
--- a/arch/arm/boot/dts/imx7d-12x12-arm2-flexcan.dts
+++ b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-flexcan.dts
@@ -6,7 +6,7 @@
  * published by the Free Software Foundation.
  */
 
-#include "imx7d-12x12-arm2.dts"
+#include "imx7d-12x12-lpddr3-arm2.dts"
 
 &sai1 {
 	status = "disabled";
diff --git a/arch/arm/boot/dts/imx7d-12x12-arm2-m4.dts b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-m4.dts
index 860b8124a4a7..b2cd838d78f3 100644
--- a/arch/arm/boot/dts/imx7d-12x12-arm2-m4.dts
+++ b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-m4.dts
@@ -1,5 +1,5 @@
 
-#include "imx7d-12x12-arm2.dts"
+#include "imx7d-12x12-lpddr3-arm2.dts"
 
 / {
 	memory {
diff --git a/arch/arm/boot/dts/imx7d-12x12-arm2-mqs.dts b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-mqs.dts
index deb1f6b726d9..09e75a6702fe 100644
--- a/arch/arm/boot/dts/imx7d-12x12-arm2-mqs.dts
+++ b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-mqs.dts
@@ -6,11 +6,11 @@
  * published by the Free Software Foundation.
  */
 
-#include "imx7d-12x12-arm2.dts"
+#include "imx7d-12x12-lpddr3-arm2.dts"
 
 / {
 	sound-mqs {
-		compatible = "fsl,imx7d-12x12-arm2-mqs",
+		compatible = "fsl,imx7d-12x12-lpddr3-arm2-mqs",
 				"fsl,imx-audio-mqs";
 		model = "mqs-audio";
 		cpu-dai = <&sai1>;
diff --git a/arch/arm/boot/dts/imx7d-12x12-arm2-qspi.dts b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-qspi.dts
index d060529b8c34..db0133b45ce6 100644
--- a/arch/arm/boot/dts/imx7d-12x12-arm2-qspi.dts
+++ b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-qspi.dts
@@ -6,7 +6,7 @@
  * published by the Free Software Foundation.
  */
 
-#include "imx7d-12x12-arm2.dts"
+#include "imx7d-12x12-lpddr3-arm2.dts"
 
 /* disable epdc, conflict with qspi */
 &epdc {
diff --git a/arch/arm/boot/dts/imx7d-12x12-arm2-sai.dts b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-sai.dts
index 696f9a055a70..d2e90feec69e 100644
--- a/arch/arm/boot/dts/imx7d-12x12-arm2-sai.dts
+++ b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-sai.dts
@@ -6,12 +6,12 @@
  * published by the Free Software Foundation.
  */
 
-#include "imx7d-12x12-arm2.dts"
+#include "imx7d-12x12-lpddr3-arm2.dts"
 
 
 / {
 	sound {
-		compatible = "fsl,imx7d-12x12-arm2-wm8958",
+		compatible = "fsl,imx7d-12x12-lpddr3-arm2-wm8958",
 			    "fsl,imx-audio-wm8958";
 		model = "wm8958-audio";
 		cpu-dai = <&sai1>;
diff --git a/arch/arm/boot/dts/imx7d-12x12-arm2.dts b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts
index 291fc411281c..57d3ef6f4d98 100644
--- a/arch/arm/boot/dts/imx7d-12x12-arm2.dts
+++ b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts
@@ -13,7 +13,7 @@
 
 / {
 	model = "Freescale i.MX7 LPDDR3 12x12 ARM2 Board";
-	compatible = "fsl,imx7d-12x12-arm2", "fsl,imx7d";
+	compatible = "fsl,imx7d-12x12-lpddr3-arm2", "fsl,imx7d";
 
 	backlight {
 		compatible = "pwm-backlight";
diff --git a/arch/arm/boot/dts/imx7d-19x19-arm2-csi.dts b/arch/arm/boot/dts/imx7d-19x19-ddr3-arm2-csi.dts
index 2f345ca7af2f..bc535a564346 100644
--- a/arch/arm/boot/dts/imx7d-19x19-arm2-csi.dts
+++ b/arch/arm/boot/dts/imx7d-19x19-ddr3-arm2-csi.dts
@@ -6,7 +6,7 @@
  * published by the Free Software Foundation.
  */
 
-#include "imx7d-19x19-arm2.dts"
+#include "imx7d-19x19-ddr3-arm2.dts"
 
 &i2c2 {
 	ov5640: ov5640@3c {
diff --git a/arch/arm/boot/dts/imx7d-19x19-arm2-sai.dts b/arch/arm/boot/dts/imx7d-19x19-ddr3-arm2-sai.dts
index 94e0373244e7..1b9d6a815699 100644
--- a/arch/arm/boot/dts/imx7d-19x19-arm2-sai.dts
+++ b/arch/arm/boot/dts/imx7d-19x19-ddr3-arm2-sai.dts
@@ -6,11 +6,11 @@
  * published by the Free Software Foundation.
  */
 
-#include "imx7d-19x19-arm2.dts"
+#include "imx7d-19x19-ddr3-arm2.dts"
 
 / {
 	sound {
-		compatible = "fsl,imx7d-19x19-arm2-wm8958",
+		compatible = "fsl,imx7d-19x19-ddr3-arm2-wm8958",
 			   "fsl,imx-audio-wm8958";
 		model = "wm8958-audio";
 		cpu-dai = <&sai2>;
diff --git a/arch/arm/boot/dts/imx7d-19x19-arm2.dts b/arch/arm/boot/dts/imx7d-19x19-ddr3-arm2.dts
index 4c3ccfea76c9..4c3ccfea76c9 100644
--- a/arch/arm/boot/dts/imx7d-19x19-arm2.dts
+++ b/arch/arm/boot/dts/imx7d-19x19-ddr3-arm2.dts