[linux] 01/01: [armhf] dts: imx6dlq-wandboard-revb1: use unique model id (Closes: #813881)

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

rosh-guest pushed a commit to branch rosh/sid
in repository linux.

commit 837fc752ada604f923a89add9b6a899d9b10edeb
Author: Roger Shimizu <rogershimizu at gmail.com>
Date:   Wed Feb 24 01:39:14 2016 +0900

    [armhf] dts: imx6dlq-wandboard-revb1: use unique model id (Closes: #813881)
---
 debian/changelog                                   |  7 +++
 ...q-wandboard-revb1.dts-use-unique-model-id.patch | 59 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 67 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 28abb96..77842f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+linux (4.4.2-4) UNRELEASED; urgency=medium
+
+  * [armhf] dts: imx6dlq-wandboard-revb1: use unique model id
+    (Closes: #813881).
+
+ -- Roger Shimizu <rogershimizu at gmail.com>  Wed, 24 Feb 2016 01:30:38 +0900
+
 linux (4.4.2-3) unstable; urgency=medium
 
   * [x86] efi-bgrt: Fix kernel panic when mapping BGRT data (Closes: #815125)
diff --git a/debian/patches/features/arm/device-tree/ARM-dts-imx6dlq-wandboard-revb1.dts-use-unique-model-id.patch b/debian/patches/features/arm/device-tree/ARM-dts-imx6dlq-wandboard-revb1.dts-use-unique-model-id.patch
new file mode 100644
index 0000000..63d2c5e
--- /dev/null
+++ b/debian/patches/features/arm/device-tree/ARM-dts-imx6dlq-wandboard-revb1.dts-use-unique-model-id.patch
@@ -0,0 +1,59 @@
+From: Heinrich Schuchardt <xypron.glpk at gmx.de>
+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 <xypron.glpk at gmx.de>
+Signed-off-by: Shawn Guo <shawnguo at kernel.org>
+---
+ 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 {
diff --git a/debian/patches/series b/debian/patches/series
index 971ac10..38b5e82 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -83,6 +83,7 @@ features/arm/arm-orion-always-use-multi_irq_handler.patch
 features/arm/arm-orion-use-sparse_irq-everywhere.patch
 features/arm/arm-orion5x-clean-up-mach-.h-headers.patch
 features/arm/arm-orion5x-multiplatform-support.patch
+features/arm/device-tree/ARM-dts-imx6dlq-wandboard-revb1.dts-use-unique-model-id.patch
 
 # Miscellaneous bug fixes
 bugfix/all/misc-bmp085-Enable-building-as-a-module.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git