debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

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

This commit is contained in:
Roger Shimizu 2016-02-24 01:39:14 +09:00
parent bd792d2441
commit 837fc752ad
3 changed files with 67 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -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@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)

59
debian/patches/features/arm/device-tree/ARM-dts-imx6dlq-wandboard-revb1.dts-use-unique-model-id.patch vendored Normal file
View File

@ -0,0 +1,59 @@
From: Heinrich Schuchardt <xypron.glpk@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@gmx.de>
Signed-off-by: Shawn Guo <shawnguo@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 {

1
debian/patches/series vendored
View File

@ -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