From mboxrd@z Thu Jan 1 00:00:00 1970 From: xypron.glpk@gmx.de (Heinrich Schuchardt) Date: Mon, 8 Feb 2016 01:25:15 +0100 Subject: [PATCH 1/1 v2] imx6q-wandboard-revb1.dts: use unique machine name In-Reply-To: References: <1454758226-4561-1-git-send-email-xypron.glpk@gmx.de> <1454760419-4822-1-git-send-email-xypron.glpk@gmx.de> Message-ID: <56B7E06B.2060701@gmx.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 08.02.2016 00:52, Robert Nelson wrote: > On Sat, Feb 6, 2016 at 6:06 AM, Heinrich Schuchardt wrote: >> 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. >> >> https://lkml.org/lkml/2014/7/8/579 created the new file >> imx6q-wandboard-revb1.dts but used the same model identifier >> as in imx6q-wandboard.dts. >> >> This patch provides a unique model identifier for revision B1 of >> the Wandboard Quad. >> >> v2: >> correct name of referenced Debian package >> >> Signed-off-by: Heinrich Schuchardt >> --- >> arch/arm/boot/dts/imx6q-wandboard-revb1.dts | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> 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"; > > Okay, this seems a little silly.... > > The wandboard has 5 versions: > > solo: imx6dl-wandboard-revb1.dts > > model = "Wandboard i.MX6 Dual Lite Board"; > > dual rev b: imx6dl-wandboard-revb1.dts > > model = "Wandboard i.MX6 Dual Lite Board"; > > dual rev c: imx6dl-wandboard.dts > > model = "Wandboard i.MX6 Dual Lite Board"; > > quad rev b: imx6q-wandboard-revb1.dts > model = "Wandboard i.MX6 Quad Board"; - > model = "Wandboard i.MX6 > Quad Board rev B1"; > > quad rev c: imx6q-wandboard.dts > model = "Wandboard i.MX6 Quad Board"; > > > Do you guys see the issue? Either we change them "ALL", rev b or rev c... > > Or "flash-kernel" needs to learn to copy more then one dtb (in this > case 5 *.dtb's) > > PS, u-boot already can boot on all these with the same SPL/u-boot > image and detect which board and load the correct device tree binary.. > > Regards, > Hello Robert, I only see four dts files mentioned in your mail (solo using the same as dual rev B1). We do not know if imx6dl-wandboard.dts and imx6q-wandboard.dts will support future revisions of the boards. So it doesn't make much sense to mark them as restricted to revision C1. You are right in that we should add a change to imx6dl-wandboard-revb1.dts to the same patch. Best regards Heinrich Schuchardt From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heinrich Schuchardt Subject: Re: [PATCH 1/1 v2] imx6q-wandboard-revb1.dts: use unique machine name Date: Mon, 8 Feb 2016 01:25:15 +0100 Message-ID: <56B7E06B.2060701@gmx.de> References: <1454758226-4561-1-git-send-email-xypron.glpk@gmx.de> <1454760419-4822-1-git-send-email-xypron.glpk@gmx.de> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Robert Nelson Cc: Shawn Guo , Sascha Hauer , George Joseph , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Russell King , "linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" , devicetree , linux kernel , Fabio Estevam List-Id: devicetree@vger.kernel.org On 08.02.2016 00:52, Robert Nelson wrote: > On Sat, Feb 6, 2016 at 6:06 AM, Heinrich Schuchardt wrote: >> 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. >> >> https://lkml.org/lkml/2014/7/8/579 created the new file >> imx6q-wandboard-revb1.dts but used the same model identifier >> as in imx6q-wandboard.dts. >> >> This patch provides a unique model identifier for revision B1 of >> the Wandboard Quad. >> >> v2: >> correct name of referenced Debian package >> >> Signed-off-by: Heinrich Schuchardt >> --- >> arch/arm/boot/dts/imx6q-wandboard-revb1.dts | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> 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"; > > Okay, this seems a little silly.... > > The wandboard has 5 versions: > > solo: imx6dl-wandboard-revb1.dts > > model = "Wandboard i.MX6 Dual Lite Board"; > > dual rev b: imx6dl-wandboard-revb1.dts > > model = "Wandboard i.MX6 Dual Lite Board"; > > dual rev c: imx6dl-wandboard.dts > > model = "Wandboard i.MX6 Dual Lite Board"; > > quad rev b: imx6q-wandboard-revb1.dts > model = "Wandboard i.MX6 Quad Board"; - > model = "Wandboard i.MX6 > Quad Board rev B1"; > > quad rev c: imx6q-wandboard.dts > model = "Wandboard i.MX6 Quad Board"; > > > Do you guys see the issue? Either we change them "ALL", rev b or rev c... > > Or "flash-kernel" needs to learn to copy more then one dtb (in this > case 5 *.dtb's) > > PS, u-boot already can boot on all these with the same SPL/u-boot > image and detect which board and load the correct device tree binary.. > > Regards, > Hello Robert, I only see four dts files mentioned in your mail (solo using the same as dual rev B1). We do not know if imx6dl-wandboard.dts and imx6q-wandboard.dts will support future revisions of the boards. So it doesn't make much sense to mark them as restricted to revision C1. You are right in that we should add a change to imx6dl-wandboard-revb1.dts to the same patch. Best regards Heinrich Schuchardt -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755096AbcBHA0U (ORCPT ); Sun, 7 Feb 2016 19:26:20 -0500 Received: from mout.gmx.net ([212.227.15.15]:49984 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754860AbcBHA0S (ORCPT ); Sun, 7 Feb 2016 19:26:18 -0500 Subject: Re: [PATCH 1/1 v2] imx6q-wandboard-revb1.dts: use unique machine name To: Robert Nelson References: <1454758226-4561-1-git-send-email-xypron.glpk@gmx.de> <1454760419-4822-1-git-send-email-xypron.glpk@gmx.de> Cc: Shawn Guo , Sascha Hauer , George Joseph , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Russell King , "linux-arm-kernel@lists.infradead.org" , devicetree , linux kernel , Fabio Estevam From: Heinrich Schuchardt X-Enigmail-Draft-Status: N1110 Message-ID: <56B7E06B.2060701@gmx.de> Date: Mon, 8 Feb 2016 01:25:15 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Icedove/38.5.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:Q80AlR23hVxs6sQIvXeCfpc6zHJdqjPzu4NeExkrbEm2aUeM8nO bVpqRyAY4hUqWUMsTRh+c3qh6u95iBzyjpIqUW+ygERtM1fUcvW0KZqPj5KlCGH1wx66fKW IeDOmxpDd3t9GxTZUY1s12TNdK118rJtFWLgo8Qc9tY7+X52Iz02gyUOtWqR4YzobKlrHYu s+wsY0Vmi+vJcaIaoX++g== X-UI-Out-Filterresults: notjunk:1;V01:K0:/6g960aoc8Y=:hv0ZSmXHD/iELOozqzsnYA YjFH4RXhTjnbqPvasUZS7DmHQB05c+5fAae+DvP23oieO3qQnA2RvEUfce6JhSaA3Khy/3V/k TapmeEK7K0/No4vdwjC/X9zv7Y0wYw0vQaSIQoyhktwKwU/o01E9N737X2UDIXFxaBhbZ6N/g m0iX0tccbqGO493Xri5X+7A7wYfJonoMbpMWrJRGpHXpWs+2EPz+sO7uC89aXi4ku0iXA86rN Op66qTX9mz5hp/P7gVs1fxr/8MWdohv9Lrjv2MRCbqe63eV1hgyjATo88vF2x2g5KcwP2uNKR zz6V/BEJ8SelskuAvN5UeSmZvzvWmFsKGMaCfHKuQPc0NXb9JWeK0r8WsZWqc4uApbBDsf+YG pCARXacJZOuPoAPpAFmkj1/ZC4smUt8PbwiBoDpzu5HUrvrWKzbDV2XaI0mBEJgEjcJKpepMT odYEMrQWnZ8YeG55hZTliie8Mw3oSXGQCiF/FUsZIGgL1F1Eg4W9UPVlVPNDacpsQ6feeOnzL MROVEvHYsEZuDcu9tB0GwaBa3KwaTh3xSP2slAAyQff35yPq/B0AN7MZOh6Kx7Snl8Gsm1GDh BGm59WHi4IUWtzMZs1Ht0o6EHnMg4vzCNYIsWLHkmrntqLkMe1yf2QzfdzRaGJ48ApYd7dQkk 8LnKvo/cHjZ4diavA98wjPHHROUNecP7ey8DYc1R9vl676/XJpN4oy8PgkMYCatI6WWQOBhFR n4FrZTmLvRPWF2wdE8fNcYH6cu9wU1hIU8Fal16rqDM51gQ+hqC+4o0l9qS3eHWsjxTg0/ndC t1SpAIv Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 08.02.2016 00:52, Robert Nelson wrote: > On Sat, Feb 6, 2016 at 6:06 AM, Heinrich Schuchardt wrote: >> 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. >> >> https://lkml.org/lkml/2014/7/8/579 created the new file >> imx6q-wandboard-revb1.dts but used the same model identifier >> as in imx6q-wandboard.dts. >> >> This patch provides a unique model identifier for revision B1 of >> the Wandboard Quad. >> >> v2: >> correct name of referenced Debian package >> >> Signed-off-by: Heinrich Schuchardt >> --- >> arch/arm/boot/dts/imx6q-wandboard-revb1.dts | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> 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"; > > Okay, this seems a little silly.... > > The wandboard has 5 versions: > > solo: imx6dl-wandboard-revb1.dts > > model = "Wandboard i.MX6 Dual Lite Board"; > > dual rev b: imx6dl-wandboard-revb1.dts > > model = "Wandboard i.MX6 Dual Lite Board"; > > dual rev c: imx6dl-wandboard.dts > > model = "Wandboard i.MX6 Dual Lite Board"; > > quad rev b: imx6q-wandboard-revb1.dts > model = "Wandboard i.MX6 Quad Board"; - > model = "Wandboard i.MX6 > Quad Board rev B1"; > > quad rev c: imx6q-wandboard.dts > model = "Wandboard i.MX6 Quad Board"; > > > Do you guys see the issue? Either we change them "ALL", rev b or rev c... > > Or "flash-kernel" needs to learn to copy more then one dtb (in this > case 5 *.dtb's) > > PS, u-boot already can boot on all these with the same SPL/u-boot > image and detect which board and load the correct device tree binary.. > > Regards, > Hello Robert, I only see four dts files mentioned in your mail (solo using the same as dual rev B1). We do not know if imx6dl-wandboard.dts and imx6q-wandboard.dts will support future revisions of the boards. So it doesn't make much sense to mark them as restricted to revision C1. You are right in that we should add a change to imx6dl-wandboard-revb1.dts to the same patch. Best regards Heinrich Schuchardt