arm: dts: zynq: improvements and cleanup

PATCH In review Luis Araneda 3 participants 12 messages Jul 12, 2018 – Jul 17, 2018

Subsystems (2)

Device tree bindings Arm/Zynq architecture

lore

Share & tools

lore

Luis Araneda

author

2018-07-12 04:10 UTC #0 lore raw

v3 cover arm: dts: zynq: improvements and cleanup

This series attempts to standardize device naming and improve its information for better identification

The values of the "compatible" and "model" device-tree properties are corrected for some devices, adding complementary information when necessary

Changes since v2:
- Split dt-bindings patch (too many changes)
- Apply dts patches first (reorder)

Changes since v1 (RFC):
- Add values to compatible property instead of replacing them
- Don't remove "internal" word from Xilinx boards on dt-bindings
- Migrate content of adapteva dt-binding file into Xilinx's
- Sort additional compatible strings alphabetically
by manufacturer
- Dropped patch that renamed the zedboard development board (no apparent benefit)
- Dropped the patch that removed the "zynq" value from the compatible strings (breaks the ABI)

Luis Araneda (6):
arm: dts: zynq: Set correct manufacturer for ZedBoard and MicroZed
boards
arm: dts: zynq: correct and improve the model property of dt files
dt-bindings: xilinx: zynq: Improve boards description
dt-bindings: xilinx: zynq: Sort entries alphabetically
dt-bindings: Move Paralella board to Xilinx
dt-bindings: xilinx: zynq: Add missing boards

 .../devicetree/bindings/arm/adapteva.txt      |  7 -----
 .../devicetree/bindings/arm/xilinx.txt        | 30 +++++++++++++++----
 arch/arm/boot/dts/zynq-cc108.dts              |  2 +-
 arch/arm/boot/dts/zynq-microzed.dts           |  4 +--
 arch/arm/boot/dts/zynq-parallella.dts         |  2 +-
 arch/arm/boot/dts/zynq-zc702.dts              |  2 +-
 arch/arm/boot/dts/zynq-zc706.dts              |  2 +-
 arch/arm/boot/dts/zynq-zc770-xm010.dts        |  2 +-
 arch/arm/boot/dts/zynq-zc770-xm011.dts        |  2 +-
 arch/arm/boot/dts/zynq-zc770-xm012.dts        |  2 +-
 arch/arm/boot/dts/zynq-zc770-xm013.dts        |  2 +-
 arch/arm/boot/dts/zynq-zed.dts                |  4 +--
 arch/arm/boot/dts/zynq-zybo-z7.dts            |  2 +-
 arch/arm/boot/dts/zynq-zybo.dts               |  2 +-
 14 files changed, 39 insertions(+), 26 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/arm/adapteva.txt

Signature · 1 line

2.18.0

Luis Araneda

author

2018-07-12 04:10 UTC #1 lore raw

PATCH v3 1/6 arm: dts: zynq: Set correct manufacturer for ZedBoard and MicroZed boards

Both boards are made by Avnet, Inc. So add an additional value to the compatible property

Signed-off-by Luis Araneda <[email protected]>

---
 arch/arm/boot/dts/zynq-microzed.dts | 2 +-
 arch/arm/boot/dts/zynq-zed.dts      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

arch/arm/boot/dts/zynq-microzed.dts +1 -1

index aa4a0b6defb8..574ef2276182 100644
@@ -8,7 +8,7 @@
 
 / {
 	model = "Zynq MicroZED Development Board";
-	compatible = "xlnx,zynq-microzed", "xlnx,zynq-7000";
+	compatible = "avnet,zynq-microzed", "xlnx,zynq-microzed", "xlnx,zynq-7000";
 
 	aliases {
 		ethernet0 = &gem0;

arch/arm/boot/dts/zynq-zed.dts +1 -1

index 53c6883ce1f6..595022487965 100644
@@ -8,7 +8,7 @@
 
 / {
 	model = "Zynq Zed Development Board";
-	compatible = "xlnx,zynq-zed", "xlnx,zynq-7000";
+	compatible = "avnet,zynq-zed", "xlnx,zynq-zed", "xlnx,zynq-7000";
 
 	aliases {
 		ethernet0 = &gem0;

Signature · 1 line

2.18.0

Luis Araneda

author

2018-07-12 04:10 UTC #2 lore raw

PATCH v3 2/6 arm: dts: zynq: correct and improve the model property of dt files

In reply to Luis Araneda

Replace the current value of the model property by a more accurate description of each board (which includes the manufacturer), as some of the boards had the same value ("Xilinx Zynq")

Signed-off-by Luis Araneda <[email protected]>

---
 arch/arm/boot/dts/zynq-cc108.dts       | 2 +-
 arch/arm/boot/dts/zynq-microzed.dts    | 2 +-
 arch/arm/boot/dts/zynq-parallella.dts  | 2 +-
 arch/arm/boot/dts/zynq-zc702.dts       | 2 +-
 arch/arm/boot/dts/zynq-zc706.dts       | 2 +-
 arch/arm/boot/dts/zynq-zc770-xm010.dts | 2 +-
 arch/arm/boot/dts/zynq-zc770-xm011.dts | 2 +-
 arch/arm/boot/dts/zynq-zc770-xm012.dts | 2 +-
 arch/arm/boot/dts/zynq-zc770-xm013.dts | 2 +-
 arch/arm/boot/dts/zynq-zed.dts         | 2 +-
 arch/arm/boot/dts/zynq-zybo-z7.dts     | 2 +-
 arch/arm/boot/dts/zynq-zybo.dts        | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

arch/arm/boot/dts/zynq-cc108.dts +1 -1

index 1a0f631c1d8d..8b9ab9bba23b 100644
@@ -12,8 +12,8 @@
 /include/ "zynq-7000.dtsi"
 
 / {
+	model = "Xilinx CC108 board";
 	compatible = "xlnx,zynq-cc108", "xlnx,zynq-7000";
-	model = "Xilinx Zynq";
 
 	aliases {
 		ethernet0 = &gem0;

arch/arm/boot/dts/zynq-microzed.dts +1 -1

index 574ef2276182..6ed84fb15902 100644
@@ -7,7 +7,7 @@
 /include/ "zynq-7000.dtsi"
 
 / {
-	model = "Zynq MicroZED Development Board";
+	model = "Avnet MicroZed board";
 	compatible = "avnet,zynq-microzed", "xlnx,zynq-microzed", "xlnx,zynq-7000";
 
 	aliases {

arch/arm/boot/dts/zynq-parallella.dts +1 -1

index c05f4b67d4c1..54592aeb92b9 100644
@@ -12,7 +12,7 @@
 /include/ "zynq-7000.dtsi"
 
 / {
-	model = "Adapteva Parallella Board";
+	model = "Adapteva Parallella board";
 	compatible = "adapteva,parallella", "xlnx,zynq-7000";
 
 	aliases {

arch/arm/boot/dts/zynq-zc702.dts +1 -1

index f2330b0cb63d..3f84b94db995 100644
@@ -7,7 +7,7 @@
 #include "zynq-7000.dtsi"
 
 / {
-	model = "Zynq ZC702 Development Board";
+	model = "Xilinx ZC702 board";
 	compatible = "xlnx,zynq-zc702", "xlnx,zynq-7000";
 
 	aliases {

arch/arm/boot/dts/zynq-zc706.dts +1 -1

index 3ad1260ff2a1..a15908cacbcf 100644
@@ -7,7 +7,7 @@
 #include "zynq-7000.dtsi"
 
 / {
-	model = "Zynq ZC706 Development Board";
+	model = "Xilinx ZC706 board";
 	compatible = "xlnx,zynq-zc706", "xlnx,zynq-7000";
 
 	aliases {

arch/arm/boot/dts/zynq-zc770-xm010.dts +1 -1

index 6884f1ad66b7..0e1bfdd3421f 100644
@@ -8,8 +8,8 @@
 #include "zynq-7000.dtsi"
 
 / {
+	model = "Xilinx ZC770 XM010 board";
 	compatible = "xlnx,zynq-zc770-xm010", "xlnx,zynq-7000";
-	model = "Xilinx Zynq";
 
 	aliases {
 		ethernet0 = &gem0;

arch/arm/boot/dts/zynq-zc770-xm011.dts +1 -1

index b78883cee96a..b7f65862c022 100644
@@ -8,8 +8,8 @@
 #include "zynq-7000.dtsi"
 
 / {
+	model = "Xilinx ZC770 XM011 board";
 	compatible = "xlnx,zynq-zc770-xm011", "xlnx,zynq-7000";
-	model = "Xilinx Zynq";
 
 	aliases {
 		i2c0 = &i2c1;

arch/arm/boot/dts/zynq-zc770-xm012.dts +1 -1

index c3169d63600d..d2359b789eb8 100644
@@ -8,8 +8,8 @@
 #include "zynq-7000.dtsi"
 
 / {
+	model = "Xilinx ZC770 XM012 board";
 	compatible = "xlnx,zynq-zc770-xm012", "xlnx,zynq-7000";
-	model = "Xilinx Zynq";
 
 	aliases {
 		i2c0 = &i2c0;

arch/arm/boot/dts/zynq-zc770-xm013.dts +1 -1

index 8bb66859d774..651913f1afa2 100644
@@ -8,8 +8,8 @@
 #include "zynq-7000.dtsi"
 
 / {
+	model = "Xilinx ZC770 XM013 board";
 	compatible = "xlnx,zynq-zc770-xm013", "xlnx,zynq-7000";
-	model = "Xilinx Zynq";
 
 	aliases {
 		ethernet0 = &gem1;

arch/arm/boot/dts/zynq-zed.dts +1 -1

index 595022487965..3a4ae51ca4da 100644
@@ -7,7 +7,7 @@
 #include "zynq-7000.dtsi"
 
 / {
-	model = "Zynq Zed Development Board";
+	model = "Avnet ZedBoard board";
 	compatible = "avnet,zynq-zed", "xlnx,zynq-zed", "xlnx,zynq-7000";
 
 	aliases {

arch/arm/boot/dts/zynq-zybo-z7.dts +1 -1

index 1e713dc98920..be40be9b7222 100644
@@ -3,7 +3,7 @@
 #include "zynq-7000.dtsi"
 
 / {
-	model = "Zynq ZYBO Z7 Development Board";
+	model = "Digilent Zybo Z7 board";
 	compatible = "digilent,zynq-zybo-z7", "xlnx,zynq-7000";
 
 	aliases {

arch/arm/boot/dts/zynq-zybo.dts +1 -1

index a6c00e7fa767..0439e9f1ea6f 100644
@@ -7,7 +7,7 @@
 #include "zynq-7000.dtsi"
 
 / {
-	model = "Zynq ZYBO Development Board";
+	model = "Digilent Zybo board";
 	compatible = "digilent,zynq-zybo", "xlnx,zynq-7000";
 
 	aliases {

Signature · 1 line

2.18.0

Luis Araneda

author

2018-07-12 04:10 UTC #3 lore raw

PATCH v3 3/6 dt-bindings: xilinx: zynq: Improve boards description

In reply to Luis Araneda

Change the description of some boards to make it similar to the value of the model property from their respective device-tree, using the format "<manufacturer> <model>"

Signed-off-by Luis Araneda <[email protected]>

---
 Documentation/devicetree/bindings/arm/xilinx.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Documentation/devicetree/bindings/arm/xilinx.txt +2 -2

index b9043bc35c14..4f1759b2bea7 100644
@@ -8,10 +8,10 @@ Required root node properties:
 
 Additional compatible strings:
 
-- Xilinx internal board cc108
+- Xilinx CC108 internal board
   "xlnx,zynq-cc108"
 
-- Xilinx internal board zc770 with different FMC cards
+- Xilinx ZC770 internal board, with different FMC cards
   "xlnx,zynq-zc770-xm010"
   "xlnx,zynq-zc770-xm011"
   "xlnx,zynq-zc770-xm012"

Signature · 1 line

2.18.0

Rob Herring

maintainer Reviewed-by on v3 3/6

2018-07-16 15:33 UTC #4 lore raw

Re: [PATCH v3 3/6] dt-bindings: xilinx: zynq: Improve boards description

Quoted 8 lines · Luis Araneda

Change the description of some boards to make it similar to the value of the model property from their respective device-tree, using the format "<manufacturer> <model>"
Signed-off-by Luis Araneda <[email protected]>
---
 Documentation/devicetree/bindings/arm/xilinx.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Reviewed-by Rob Herring <[email protected]>

Luis Araneda

author

2018-07-12 04:10 UTC #5 lore raw

PATCH v3 4/6 dt-bindings: xilinx: zynq: Sort entries alphabetically

In reply to Luis Araneda

Sort additional compatible strings (boards) alphabetically by their manufacturer and model number

This will help when finding a board because they
will be grouped by their manufacturer

Signed-off-by Luis Araneda <[email protected]>

---
 Documentation/devicetree/bindings/arm/xilinx.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Documentation/devicetree/bindings/arm/xilinx.txt +3 -3

index 4f1759b2bea7..a8e70a794d2e 100644
@@ -8,6 +8,9 @@ Required root node properties:
 
 Additional compatible strings:
 
+- Digilent Zybo Z7 board
+  "digilent,zynq-zybo-z7"
+
 - Xilinx CC108 internal board
   "xlnx,zynq-cc108"

@@ -17,9 +20,6 @@ Additional compatible strings:
   "xlnx,zynq-zc770-xm012"
   "xlnx,zynq-zc770-xm013"
 
-- Digilent Zybo Z7 board
-  "digilent,zynq-zybo-z7"
-
 ---------------------------------------------------------------
 
 Xilinx Zynq UltraScale+ MPSoC Platforms Device Tree Bindings

Signature · 1 line

2.18.0

Rob Herring

maintainer Reviewed-by on v3 4/6

2018-07-16 15:34 UTC #6 lore raw

Re: [PATCH v3 4/6] dt-bindings: xilinx: zynq: Sort entries alphabetically

Quoted 10 lines · Luis Araneda

Sort additional compatible strings (boards) alphabetically by their manufacturer and model number
This will help when finding a board because they
will be grouped by their manufacturer
Signed-off-by Luis Araneda <[email protected]>
---
 Documentation/devicetree/bindings/arm/xilinx.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Reviewed-by Rob Herring <[email protected]>

Luis Araneda

author

2018-07-12 04:10 UTC #7 lore raw

PATCH v3 5/6 dt-bindings: Move Paralella board to Xilinx

In reply to Luis Araneda

Move the Adapteva Parallela board to Xilinx dt-bindings, as it's based on a Zynq SoC from Xilinx

Signed-off-by Luis Araneda <[email protected]>

---
 Documentation/devicetree/bindings/arm/adapteva.txt | 7 -------
 Documentation/devicetree/bindings/arm/xilinx.txt   | 3 +++
 2 files changed, 3 insertions(+), 7 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/arm/adapteva.txt

Documentation/devicetree/bindings/arm/adapteva.txt deleted +0 -7

deleted file mode 100644
index 1d8af9e36065..000000000000
@@ -1,7 +0,0 @@
-Adapteva Platforms Device Tree Bindings
----------------------------------------
-
-Parallella board
-
-Required root node properties:
-    - compatible = "adapteva,parallella";

Documentation/devicetree/bindings/arm/xilinx.txt +3 -0

index a8e70a794d2e..d1a6deac90b5 100644
@@ -8,6 +8,9 @@ Required root node properties:
 
 Additional compatible strings:
 
+- Adapteva Parallella board
+  "adapteva,parallella"
+
 - Digilent Zybo Z7 board
   "digilent,zynq-zybo-z7"

Signature · 1 line

2.18.0

Rob Herring

maintainer Reviewed-by on v3 5/6

2018-07-16 15:34 UTC #8 lore raw

Re: [PATCH v3 5/6] dt-bindings: Move Paralella board to Xilinx

Quoted 9 lines · Luis Araneda

Move the Adapteva Parallela board to Xilinx dt-bindings, as it's based on a Zynq SoC from Xilinx
Signed-off-by Luis Araneda <[email protected]>
---
 Documentation/devicetree/bindings/arm/adapteva.txt | 7 -------
 Documentation/devicetree/bindings/arm/xilinx.txt   | 3 +++
 2 files changed, 3 insertions(+), 7 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/arm/adapteva.txt

Reviewed-by Rob Herring <[email protected]>

Luis Araneda

author

2018-07-12 04:10 UTC #9 lore raw

PATCH v3 6/6 dt-bindings: xilinx: zynq: Add missing boards

In reply to Luis Araneda

The bindings were missing when the device-tree
files were added

Signed-off-by Luis Araneda <[email protected]>

---
 .../devicetree/bindings/arm/xilinx.txt          | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

Documentation/devicetree/bindings/arm/xilinx.txt +17 -0

index d1a6deac90b5..26fe5ecc4332 100644
@@ -11,12 +11,29 @@ Additional compatible strings:
 - Adapteva Parallella board
   "adapteva,parallella"
 
+- Avnet MicroZed board
+  "avnet,zynq-microzed"
+  "xlnx,zynq-microzed"
+
+- Avnet ZedBoard board
+  "avnet,zynq-zed"
+  "xlnx,zynq-zed"
+
+- Digilent Zybo board
+  "digilent,zynq-zybo"
+
 - Digilent Zybo Z7 board
   "digilent,zynq-zybo-z7"
 
 - Xilinx CC108 internal board
   "xlnx,zynq-cc108"
 
+- Xilinx ZC702 internal board
+  "xlnx,zynq-zc702"
+
+- Xilinx ZC706 internal board
+  "xlnx,zynq-zc706"
+
 - Xilinx ZC770 internal board, with different FMC cards
   "xlnx,zynq-zc770-xm010"
   "xlnx,zynq-zc770-xm011"

Signature · 1 line

2.18.0

Rob Herring

maintainer Reviewed-by on v3 6/6

2018-07-16 15:35 UTC #10 lore raw

Re: [PATCH v3 6/6] dt-bindings: xilinx: zynq: Add missing boards

Quoted 7 lines · Luis Araneda

The bindings were missing when the device-tree
files were added
Signed-off-by Luis Araneda <[email protected]>
---
 .../devicetree/bindings/arm/xilinx.txt          | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

Reviewed-by Rob Herring <[email protected]>

Michal Simek

2018-07-17 14:24 UTC #11 lore raw

In reply to Luis Araneda

Quoted 31 lines · Luis Araneda

This series attempts to standardize device naming and improve its information for better identification
The values of the "compatible" and "model" device-tree properties are corrected for some devices, adding complementary information when necessary
Changes since v2:
- Split dt-bindings patch (too many changes)
- Apply dts patches first (reorder)
Changes since v1 (RFC):
- Add values to compatible property instead of replacing them
- Don't remove "internal" word from Xilinx boards on dt-bindings
- Migrate content of adapteva dt-binding file into Xilinx's
- Sort additional compatible strings alphabetically
by manufacturer
- Dropped patch that renamed the zedboard development board (no apparent benefit)
- Dropped the patch that removed the "zynq" value from the compatible strings (breaks the ABI)
Luis Araneda (6):
arm: dts: zynq: Set correct manufacturer for ZedBoard and MicroZed
boards
arm: dts: zynq: correct and improve the model property of dt files
dt-bindings: xilinx: zynq: Improve boards description
dt-bindings: xilinx: zynq: Sort entries alphabetically
dt-bindings: Move Paralella board to Xilinx
dt-bindings: xilinx: zynq: Add missing boards

Quoted 17 lines

 .../devicetree/bindings/arm/adapteva.txt      |  7 -----
 .../devicetree/bindings/arm/xilinx.txt        | 30 +++++++++++++++----
 arch/arm/boot/dts/zynq-cc108.dts              |  2 +-
 arch/arm/boot/dts/zynq-microzed.dts           |  4 +--
 arch/arm/boot/dts/zynq-parallella.dts         |  2 +-
 arch/arm/boot/dts/zynq-zc702.dts              |  2 +-
 arch/arm/boot/dts/zynq-zc706.dts              |  2 +-
 arch/arm/boot/dts/zynq-zc770-xm010.dts        |  2 +-
 arch/arm/boot/dts/zynq-zc770-xm011.dts        |  2 +-
 arch/arm/boot/dts/zynq-zc770-xm012.dts        |  2 +-
 arch/arm/boot/dts/zynq-zc770-xm013.dts        |  2 +-
 arch/arm/boot/dts/zynq-zed.dts                |  4 +--
 arch/arm/boot/dts/zynq-zybo-z7.dts            |  2 +-
 arch/arm/boot/dts/zynq-zybo.dts               |  2 +-
 14 files changed, 39 insertions(+), 26 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/arm/adapteva.txt

Applied all.

Thanks,
Michal