[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 at pengutronix.de>
Signed-off-by: Ian Abbott <abbotti at 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