Bug#813881: [PATCH 1/1 v3] ARM: dts: imx6dlq-wandboard-revb1.dts: use unique model id
Shawn Guo the Linux kernel maintainer of ARM/Freescale IMX / MXC ARM
architecture has accepted my appended patch 0001-ARM... to change the
model id of the Wandboard Quad Rev B1 and the Wandboard Dual Rev B1.
See
https://lkml.org/lkml/2016/2/14/34
https://lkml.org/lkml/2016/2/7/270
I suggest to add the patch to
linux-source-4.3 (debian/patches/bugfix/arm)
and to update flash-kernel (patch 0001-db... appended).
Best regards
Heinrich Schuchardt
>From 929c1ba8dc75dfca231a751e7c82032e333bc93e Mon Sep 17 00:00:00 2001
From: Heinrich Schuchardt <xypron.glpk@gmx.de>
Date: Sun, 14 Feb 2016 09:50:35 +0100
Subject: [PATCH 1/1] db/all.db: rev B1 of Wandboard Dual Lite and Quad
Wandboard Dual Lite and Quad exist in different revisions requiring
different dtb files.
Revision C1 works with the existing entries in the database.
New entries for revision B1 are created. These are based on
https://lkml.org/lkml/2016/2/7/270
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---
db/all.db | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/db/all.db b/db/all.db
index 970f803..38241ce 100644
--- a/db/all.db
+++ b/db/all.db
@@ -1115,6 +1115,13 @@ Boot-Script-Path: /boot/boot.scr
U-Boot-Script-Name: bootscr.wandboard
Required-Packages: u-boot-tools
+Machine: Wandboard i.MX6 Dual Lite Board rev B1
+Kernel-Flavors: armmp
+DTB-Id: imx6dl-wandboard-revb1.dtb
+Boot-Script-Path: /boot/boot.scr
+U-Boot-Script-Name: bootscr.wandboard
+Required-Packages: u-boot-tools
+
Machine: Wandboard i.MX6 Quad Board
Kernel-Flavors: armmp
DTB-Id: imx6q-wandboard.dtb
@@ -1122,6 +1129,13 @@ Boot-Script-Path: /boot/boot.scr
U-Boot-Script-Name: bootscr.wandboard
Required-Packages: u-boot-tools
+Machine: Wandboard i.MX6 Quad Board rev B1
+Kernel-Flavors: armmp
+DTB-Id: imx6q-wandboard-revb1.dtb
+Boot-Script-Path: /boot/boot.scr
+U-Boot-Script-Name: bootscr.wandboard
+Required-Packages: u-boot-tools
+
Machine: Wexler TAB7200
Kernel-Flavors: armmp armmp-lpae
Boot-Script-Path: /boot/boot.scr
--
2.1.4
>From 370f5078a2b1561bf2b7a6f3c73f78cb54176ef9 Mon Sep 17 00:00:00 2001
From: Heinrich Schuchardt <xypron.glpk@gmx.de>
Date: Mon, 8 Feb 2016 01:55:08 +0100
Subject: [PATCH 1/1 v3] 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.
v3:
update imx6dl-wandboard-revb1.dts
v2:
correct name of referenced Debian package
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---
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 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 {
--
2.1.4
Reply to: