mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ian Abbott <abbotti@mev.co.uk>
To: barebox@lists.infradead.org
Cc: Steffen Trumtrar <s.trumtrar@pengutronix.de>,
	Ian Abbott <abbotti@mev.co.uk>
Subject: [PATCH 2/2] ARM: Terasic SoCkit: Use upstream compatible string
Date: Fri,  5 Nov 2021 12:21:46 +0000	[thread overview]
Message-ID: <20211105122146.29370-3-abbotti@mev.co.uk> (raw)
In-Reply-To: <20211105122146.29370-1-abbotti@mev.co.uk>

The upstream (Linux) 'compatible' string for the Terasic SoCkit board in
"dts/src/arm/socfpga_cyclone5_sockit.dts" differs from the barebox
'compatible' string for the same board in
"arch/arm/dts/socfpga_cyclone5_sockit.dts":

Linux: "terasic,socfpga-cyclone5-sockit"
barebox:  "terasic,sockit"

That results in an incompatibility when trying to boot a bootloader spec
entry with a 'devicetree' key that refers to the DTB file built from the
Linux sources.  The barebox bootloader spec loader will ignore the entry
because the 'compatible' string in the root node of the DTB does not
match what barebox expects.

Remove the 'compatible' string list from
"arch/arm/dts/socfpga_cyclone5_sockit.dts" so that barebox uses the
upstream compatible string list.  Also remove the 'model' string
("Terasic SoCkit") which is identical to the upstream 'model' string.

Finally, update the `of_machine_is_compatible("terasic,sockit")`
function call in `socfpga_console_init()` to use the
"terasic,socfpga-cyclone5-sockit" string.

Cc: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 arch/arm/boards/terasic-sockit/board.c   | 2 +-
 arch/arm/dts/socfpga_cyclone5_sockit.dts | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/arch/arm/boards/terasic-sockit/board.c b/arch/arm/boards/terasic-sockit/board.c
index ec68315998..19e67ff933 100644
--- a/arch/arm/boards/terasic-sockit/board.c
+++ b/arch/arm/boards/terasic-sockit/board.c
@@ -25,7 +25,7 @@ static int phy_fixup(struct phy_device *dev)
 
 static int socfpga_console_init(void)
 {
-	if (!of_machine_is_compatible("terasic,sockit"))
+	if (!of_machine_is_compatible("terasic,socfpga-cyclone5-sockit"))
 		return 0;
 
 	if (IS_ENABLED(CONFIG_PHYLIB))
diff --git a/arch/arm/dts/socfpga_cyclone5_sockit.dts b/arch/arm/dts/socfpga_cyclone5_sockit.dts
index 23e07c964c..27d2087a33 100644
--- a/arch/arm/dts/socfpga_cyclone5_sockit.dts
+++ b/arch/arm/dts/socfpga_cyclone5_sockit.dts
@@ -19,9 +19,6 @@
 #include "socfpga.dtsi"
 
 / {
-	model = "Terasic SoCkit";
-	compatible = "terasic,sockit", "altr,socfpga";
-
 	chosen {
 		stdout-path = &uart0;
 
-- 
2.33.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox


  parent reply	other threads:[~2021-11-05 12:23 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-05 12:21 [PATCH 0/2] ARM: socfpga: Use upstream compatible strings Ian Abbott
2021-11-05 12:21 ` [PATCH 1/2] ARM: Terasic DE0-Nano-SoC/Atlas-SoC: Use upstream compatible string Ian Abbott
2021-11-05 12:21 ` Ian Abbott [this message]
2021-11-08  8:11 ` [PATCH 0/2] ARM: socfpga: Use upstream compatible strings Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211105122146.29370-3-abbotti@mev.co.uk \
    --to=abbotti@mev.co.uk \
    --cc=barebox@lists.infradead.org \
    --cc=s.trumtrar@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox