summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeinrich Schuchardt <xypron.glpk@gmx.de>2016-02-08 01:55:08 +0100
committerShawn Guo <shawnguo@kernel.org>2016-02-29 16:17:31 +0800
commitd59561479e6f9cccc1d5905db37f668e1cbfdac2 (patch)
treedcfb88db2d60070b6f63b268265ea678b0c29c5f
parent1db15321187c11568e650c30a2b8562339415dc4 (diff)
downloadop-kernel-dev-d59561479e6f9cccc1d5905db37f668e1cbfdac2.zip
op-kernel-dev-d59561479e6f9cccc1d5905db37f668e1cbfdac2.tar.gz
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>
-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 f607d4f..8c314ee 100644
--- a/arch/arm/boot/dts/imx6dl-wandboard-revb1.dts
+++ b/arch/arm/boot/dts/imx6dl-wandboard-revb1.dts
@@ -13,7 +13,7 @@
#include "imx6qdl-wandboard-revb1.dtsi"
/ {
- model = "Wandboard i.MX6 Dual Lite Board";
+ model = "Wandboard i.MX6 Dual Lite Board rev B1";
compatible = "wand,imx6dl-wandboard", "fsl,imx6dl";
memory {
diff --git a/arch/arm/boot/dts/imx6q-wandboard-revb1.dts b/arch/arm/boot/dts/imx6q-wandboard-revb1.dts
index 20bf3c2..9207d80 100644
--- a/arch/arm/boot/dts/imx6q-wandboard-revb1.dts
+++ b/arch/arm/boot/dts/imx6q-wandboard-revb1.dts
@@ -13,7 +13,7 @@
#include "imx6qdl-wandboard-revb1.dtsi"
/ {
- model = "Wandboard i.MX6 Quad Board";
+ model = "Wandboard i.MX6 Quad Board rev B1";
compatible = "wand,imx6q-wandboard", "fsl,imx6q";
memory {
OpenPOWER on IntegriCloud