[PATCH 0/2] ARM: socfpga: Use upstream compatible strings

[PATCH 0/2] ARM: socfpga: Use upstream compatible strings

[Ian Abbott]

Fix up the 'compatible' strings for a couple of SoCFPGA development
boards to match those provided upstream (by Linux).

1) ARM: Terasic DE0-Nano-SoC/Atlas-SoC: Use upstream compatible string
2) ARM: Terasic SoCkit: Use upstream compatible string

 arch/arm/boards/terasic-de0-nano-soc/board.c   | 2 +-
 arch/arm/boards/terasic-sockit/board.c         | 2 +-
 arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts | 3 ---
 arch/arm/dts/socfpga_cyclone5_sockit.dts       | 3 ---
 4 files changed, 2 insertions(+), 8 deletions(-)


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

[PATCH 1/2] ARM: Terasic DE0-Nano-SoC/Atlas-SoC: Use upstream compatible string

[Ian Abbott]

The upstream (Linux) 'compatible' string for the Terasic
DE0-Nano-SoC/Atlas-SoC board in
"dts/src/arm/socfpga_cyclone5_de0_nano_soc.dts" differs from the barebox
'compatible' string for the same board in
"arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts":

Linux: "terasic,de0-atlas"
barebox:  "terasic,de0-nano-soc"

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_de0_nano_soc.dts" so that barebox uses
the upstream compatible string list.  Also remove the 'model' string
("Terasic DE0-Nano-SoC/Atlas-SoC Kit") so that barebox uses the upstream
(and shorter!) model name ("Terasic DE-0(Atlas)").

Finally, update the `of_machine_is_compatible("terasic,de0-nano-soc")`
function call in `socfpga_init()` to use the "terasic,de0-atlas" string.

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

diff --git a/arch/arm/boards/terasic-de0-nano-soc/board.c b/arch/arm/boards/terasic-de0-nano-soc/board.c
index 8e69319d17..c6036a41f9 100644
--- a/arch/arm/boards/terasic-de0-nano-soc/board.c
+++ b/arch/arm/boards/terasic-de0-nano-soc/board.c
@@ -24,7 +24,7 @@ static int phy_fixup(struct phy_device *dev)
 
 static int socfpga_init(void)
 {
-	if (!of_machine_is_compatible("terasic,de0-nano-soc"))
+	if (!of_machine_is_compatible("terasic,de0-atlas"))
 		return 0;
 
 	if (IS_ENABLED(CONFIG_PHYLIB))
diff --git a/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts b/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts
index 427f150fb4..c737b091a7 100644
--- a/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts
+++ b/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts
@@ -19,9 +19,6 @@
 #include "socfpga.dtsi"
 
 / {
-	model = "Terasic DE0-Nano-SoC/Atlas-SoC Kit";
-	compatible = "terasic,de0-nano-soc","altr,socfpga-cyclone5", "altr,socfpga";
-
 	chosen {
 		stdout-path = &uart0;
 
-- 
2.33.0


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

[PATCH 2/2] ARM: Terasic SoCkit: Use upstream compatible string

[Ian Abbott]

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

Re: [PATCH 0/2] ARM: socfpga: Use upstream compatible strings

[Sascha Hauer]

On Fri, Nov 05, 2021 at 12:21:44PM +0000, Ian Abbott wrote:
> Fix up the 'compatible' strings for a couple of SoCFPGA development
> boards to match those provided upstream (by Linux).
> 
> 1) ARM: Terasic DE0-Nano-SoC/Atlas-SoC: Use upstream compatible string
> 2) ARM: Terasic SoCkit: Use upstream compatible string
> 
>  arch/arm/boards/terasic-de0-nano-soc/board.c   | 2 +-
>  arch/arm/boards/terasic-sockit/board.c         | 2 +-
>  arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts | 3 ---
>  arch/arm/dts/socfpga_cyclone5_sockit.dts       | 3 ---
>  4 files changed, 2 insertions(+), 8 deletions(-)

Applied, thanks

Sascha

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

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