aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorHeinrich Schuchardt <xypron.glpk@gmx.de>2016-02-07 19:55:08 -0500
committerShawn Guo <shawnguo@kernel.org>2016-02-29 03:17:31 -0500
commitd59561479e6f9cccc1d5905db37f668e1cbfdac2 (patch)
treedcfb88db2d60070b6f63b268265ea678b0c29c5f /arch/arm
parent1db15321187c11568e650c30a2b8562339415dc4 (diff)
ARM: dts: imx6dlq-wandboard-revb1.dts: use unique model id
Downstream packages like Debian flash-kernel use /proc/device-tree/model to determine which dtb file to install. Hence each dts in the Linux kernel should provide a unique model identifier. Commit 8536239e371f ("ARM: dts: Restructure imx6qdl-wandboard.dtsi for new rev C1 board.")' created new files imx6dl-wandboard-revb1.dts and imx6q-wandboard-revb1.dts but used the same model identifier as in imx6dl-wandboard.dts and imx6q-wandboard.dts. This patch provides unique model identifiers for revision B1 of the Wandboard Dual and Wandbaord Quad. The patch leaves imx6dl-wandboard.dts and imx6q-wandboard.dts unchanged because it is not foreseeable if the same dts will valid for future board revisions or not. Furthermore we should avoid unnecessary changes. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/imx6dl-wandboard-revb1.dts2
-rw-r--r--arch/arm/boot/dts/imx6q-wandboard-revb1.dts2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx6dl-wandboard-revb1.dts b/arch/arm/boot/dts/imx6dl-wandboard-revb1.dts
index f607d4f1d244..8c314eee4fdd 100644
--- a/arch/arm/boot/dts/imx6dl-wandboard-revb1.dts
+++ b/arch/arm/boot/dts/imx6dl-wandboard-revb1.dts
@@ -13,7 +13,7 @@
13#include "imx6qdl-wandboard-revb1.dtsi" 13#include "imx6qdl-wandboard-revb1.dtsi"
14 14
15/ { 15/ {
16 model = "Wandboard i.MX6 Dual Lite Board"; 16 model = "Wandboard i.MX6 Dual Lite Board rev B1";
17 compatible = "wand,imx6dl-wandboard", "fsl,imx6dl"; 17 compatible = "wand,imx6dl-wandboard", "fsl,imx6dl";
18 18
19 memory { 19 memory {
diff --git a/arch/arm/boot/dts/imx6q-wandboard-revb1.dts b/arch/arm/boot/dts/imx6q-wandboard-revb1.dts
index 20bf3c282623..9207d80f9cfb 100644
--- a/arch/arm/boot/dts/imx6q-wandboard-revb1.dts
+++ b/arch/arm/boot/dts/imx6q-wandboard-revb1.dts
@@ -13,7 +13,7 @@
13#include "imx6qdl-wandboard-revb1.dtsi" 13#include "imx6qdl-wandboard-revb1.dtsi"
14 14
15/ { 15/ {
16 model = "Wandboard i.MX6 Quad Board"; 16 model = "Wandboard i.MX6 Quad Board rev B1";
17 compatible = "wand,imx6q-wandboard", "fsl,imx6q"; 17 compatible = "wand,imx6q-wandboard", "fsl,imx6q";
18 18
19 memory { 19 memory {