From: Heinrich Schuchardt Date: Mon, 8 Feb 2016 01:55:08 +0100 Subject: [PATCH] ARM: dts: imx6dlq-wandboard-revb1.dts: use unique model id Origin: https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/?id=ee10774a9b48e8785f1426e273059c4ba038a27f Bug-Debian: https://bugs.debian.org/813881 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 Signed-off-by: Shawn Guo --- arch/arm/boot/dts/imx6dl-wandboard-revb1.dts | 2 +- arch/arm/boot/dts/imx6q-wandboard-revb1.dts | 2 +- 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 @@ #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 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 @@ #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 {