ARM: dts: socfpga: add specific compatible strings for boards

PATCH Superseded Dinh Nguyen 2 participants 3 messages Nov 1, 2016 – Nov 8, 2016 Device tree bindings

lore

Share & tools

lore

Dinh Nguyen

author

2016-11-01 20:56 UTC #0 lore raw

PATCH v2 1/1 ARM: dts: socfpga: add specific compatible strings for boards

Add a more specific board compatible entry for all of the SOCFPGA Cyclone 5 based boards.

Signed-off-by Dinh Nguyen <[email protected]>

---
v2: remove extra space and add a comma between compatible entries

---
 arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts  | 2 +-
 arch/arm/boot/dts/socfpga_cyclone5_mcvevk.dts      | 2 +-
 arch/arm/boot/dts/socfpga_cyclone5_socdk.dts       | 2 +-
 arch/arm/boot/dts/socfpga_cyclone5_sockit.dts      | 2 +-
 arch/arm/boot/dts/socfpga_cyclone5_sodia.dts       | 2 +-
 arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts +1 -1

index afea364..5ecd2ef 100644
@@ -18,7 +18,7 @@
 
 / {
 	model = "Terasic DE-0(Atlas)";
-	compatible = "altr,socfpga-cyclone5", "altr,socfpga";
+	compatible = "terasic,de0-atlas", "altr,socfpga-cyclone5", "altr,socfpga";
 
 	chosen {
 		bootargs = "earlyprintk";

arch/arm/boot/dts/socfpga_cyclone5_mcvevk.dts +1 -1

index 424523b..e5a98e5 100644
@@ -19,7 +19,7 @@
 
 / {
 	model = "Aries/DENX MCV EVK";
-	compatible = "altr,socfpga-cyclone5", "altr,socfpga";
+	compatible = "denx,mcvevk", "altr,socfpga-cyclone5", "altr,socfpga";
 
 	aliases {
 		ethernet0 = &gmac0;

arch/arm/boot/dts/socfpga_cyclone5_socdk.dts +1 -1

index 15e43f4..b0577c1 100644
@@ -19,7 +19,7 @@
 
 / {
 	model = "Altera SOCFPGA Cyclone V SoC Development Kit";
-	compatible = "altr,socfpga-cyclone5", "altr,socfpga";
+	compatible = "altr,socdk", "altr,socfpga-cyclone5", "altr,socfpga";
 
 	chosen {
 		bootargs = "earlyprintk";

arch/arm/boot/dts/socfpga_cyclone5_sockit.dts +1 -1

index 02e22f5..c5623a7 100644
@@ -19,7 +19,7 @@
 
 / {
 	model = "Terasic SoCkit";
-	compatible = "altr,socfpga-cyclone5", "altr,socfpga";
+	compatible = "terasic,sockit", "altr,socfpga-cyclone5", "altr,socfpga";
 
 	chosen {
 		bootargs = "earlyprintk";

arch/arm/boot/dts/socfpga_cyclone5_sodia.dts +1 -1

index 9aaf413..5b7e3c2 100644
@@ -21,7 +21,7 @@
 
 / {
 	model = "Altera SOCFPGA Cyclone V SoC Macnica Sodia board";
-	compatible = "altr,socfpga-cyclone5", "altr,socfpga";
+	compatible = "macnica,sodia", "altr,socfpga-cyclone5", "altr,socfpga";
 
 	chosen {
 		bootargs = "earlyprintk";

arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts +1 -1

index b844473..363ee62 100644
@@ -51,7 +51,7 @@
 
 / {
 	model = "samtec VIN|ING FPGA";
-	compatible = "altr,socfpga-cyclone5", "altr,socfpga";
+	compatible = "samtec,vining", "altr,socfpga-cyclone5", "altr,socfpga";
 
 	chosen {
 		bootargs = "console=ttyS0,115200";

Signature · 1 line

2.8.3

Olof Johansson

2016-11-01 22:23 UTC #1 lore raw

PATCH v2 1/1 ARM: dts: socfpga: add specific compatible strings for boards

Quoted 46 lines · Dinh Nguyen

Add a more specific board compatible entry for all of the SOCFPGA Cyclone 5 based boards.

Signed-off-by Dinh Nguyen <[email protected]>

---
v2: remove extra space and add a comma between compatible entries

---
 arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts  | 2 +-
 arch/arm/boot/dts/socfpga_cyclone5_mcvevk.dts      | 2 +-
 arch/arm/boot/dts/socfpga_cyclone5_socdk.dts       | 2 +-
 arch/arm/boot/dts/socfpga_cyclone5_sockit.dts      | 2 +-
 arch/arm/boot/dts/socfpga_cyclone5_sodia.dts       | 2 +-
 arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts +1 -1

index afea364..5ecd2ef 100644
@@ -18,7 +18,7 @@
 
 / {
 	model = "Terasic DE-0(Atlas)";
-	compatible = "altr,socfpga-cyclone5", "altr,socfpga";
+	compatible = "terasic,de0-atlas", "altr,socfpga-cyclone5", "altr,socfpga";
 
 	chosen {
 		bootargs = "earlyprintk";

arch/arm/boot/dts/socfpga_cyclone5_mcvevk.dts +1 -1

index 424523b..e5a98e5 100644
@@ -19,7 +19,7 @@
 
 / {
 	model = "Aries/DENX MCV EVK";
-	compatible = "altr,socfpga-cyclone5", "altr,socfpga";
+	compatible = "denx,mcvevk", "altr,socfpga-cyclone5", "altr,socfpga";
 
 	aliases {
 		ethernet0 = &gmac0;

arch/arm/boot/dts/socfpga_cyclone5_socdk.dts +0 -0

index 15e43f4..b0577c1 100644

arch/arm/boot/dts/socfpga_cyclone5_socdk.dts line 22

Quoted 5 lines

arch/arm/boot/dts/socfpga_cyclone5_socdk.dts +1 -1

@@ -19,7 +19,7 @@
 
 / {
 	model = "Altera SOCFPGA Cyclone V SoC Development Kit";
-	compatible = "altr,socfpga-cyclone5", "altr,socfpga";
+	compatible = "altr,socdk", "altr,socfpga-cyclone5", "altr,socfpga";

This looks a little too generic, what if there's another dk with another SoC down the road?

arch/arm/boot/dts/socfpga_cyclone5_sockit.dts line 22

Quoted 12 lines

arch/arm/boot/dts/socfpga_cyclone5_socdk.dts +0 -0

 	chosen {
 		bootargs = "earlyprintk";

arch/arm/boot/dts/socfpga_cyclone5_sockit.dts +1 -1

index 02e22f5..c5623a7 100644
@@ -19,7 +19,7 @@
 
 / {
 	model = "Terasic SoCkit";
-	compatible = "altr,socfpga-cyclone5", "altr,socfpga";
+	compatible = "terasic,sockit", "altr,socfpga-cyclone5", "altr,socfpga";

Same thing here, this seems a bit on the generic side.

-Olof

Dinh Nguyen

author

2016-11-08 20:53 UTC #2 lore raw

PATCH v2 1/1 ARM: dts: socfpga: add specific compatible strings for boards

Quoted 4 lines · Olof Johansson

Quoted 3 lines · Dinh Nguyen
Add a more specific board compatible entry for all of the SOCFPGA Cyclone 5 based boards.

[snip]

Quoted 8 lines

arch/arm/boot/dts/socfpga_cyclone5_socdk.dts line 22
Quoted 4 lines
/ {
arch/arm/boot/dts/socfpga_cyclone5_socdk.dts +1 -1
 	model = "Altera SOCFPGA Cyclone V SoC Development Kit";
-	compatible = "altr,socfpga-cyclone5", "altr,socfpga";
+	compatible = "altr,socdk", "altr,socfpga-cyclone5", "altr,socfpga";
This looks a little too generic, what if there's another dk with another SoC down the road?

Right...I'll change it to "altr,socfpga-cyclone5-socdk",

Quoted 8 lines

Quoted 8 lines
(quoted diff) +0 -0
 	chosen {
 		bootargs = "earlyprintk";
arch/arm/boot/dts/socfpga_cyclone5_sockit.dts +0 -0
index 02e22f5..c5623a7 100644
@@ -19,7 +19,7 @@
 

Quoted 7 lines

arch/arm/boot/dts/socfpga_cyclone5_sockit.dts line 22
Quoted 4 lines
arch/arm/boot/dts/socfpga_cyclone5_sockit.dts +1 -1
 / {
 	model = "Terasic SoCkit";
-	compatible = "altr,socfpga-cyclone5", "altr,socfpga";
+	compatible = "terasic,sockit", "altr,socfpga-cyclone5", "altr,socfpga";
Same thing here, this seems a bit on the generic side.

perhaps "terasic,socfpga-cyclone5-sockit" ?

Thanks for reviewing.

Dinh