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
Additionally, a device-tree file is renamed to reflect the real model
of the device
I'm sending the series as an RFC because I don't know if
device-tree files can be renamed and properties be changed
(the last patch in particular)
The patches are sorted (descending) by what I think is
the probability of being accepted
Luis Araneda (5):
arm: dts: zynq: Set correct manufacturer for ZedBoard and MicroZed
boards
dt-bindings: xilinx: Add missing zynq boards
arm: dts: zynq: correct and improve the model property of dt files
arm: dts: zynq: rename board zed to zedboard
arm: dts: zynq: remove "zynq" prefix from compatible property
.../devicetree/bindings/arm/xilinx.txt | 34 ++++++++++++++-----
arch/arm/boot/dts/Makefile | 2 +-
arch/arm/boot/dts/zynq-cc108.dts | 4 +--
arch/arm/boot/dts/zynq-microzed.dts | 4 +--
arch/arm/boot/dts/zynq-parallella.dts | 2 +-
arch/arm/boot/dts/zynq-zc702.dts | 4 +--
arch/arm/boot/dts/zynq-zc706.dts | 4 +--
arch/arm/boot/dts/zynq-zc770-xm010.dts | 4 +--
arch/arm/boot/dts/zynq-zc770-xm011.dts | 4 +--
arch/arm/boot/dts/zynq-zc770-xm012.dts | 4 +--
arch/arm/boot/dts/zynq-zc770-xm013.dts | 4 +--
.../dts/{zynq-zed.dts => zynq-zedboard.dts} | 4 +--
arch/arm/boot/dts/zynq-zybo-z7.dts | 4 +--
arch/arm/boot/dts/zynq-zybo.dts | 4 +--
14 files changed, 50 insertions(+), 32 deletions(-)
rename arch/arm/boot/dts/{zynq-zed.dts => zynq-zedboard.dts} (89%)
--
2.18.0
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(-)
diff --git a/arch/arm/boot/dts/zynq-cc108.dts b/arch/arm/boot/dts/zynq-cc108.dts
index 1a0f631c1..8b9ab9bba 100644
--- a/arch/arm/boot/dts/zynq-cc108.dts
+++ b/arch/arm/boot/dts/zynq-cc108.dts
@@ -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;
diff --git a/arch/arm/boot/dts/zynq-microzed.dts b/arch/arm/boot/dts/zynq-microzed.dts
index e40f40a7f..3cc957428 100644
--- a/arch/arm/boot/dts/zynq-microzed.dts
+++ b/arch/arm/boot/dts/zynq-microzed.dts
@@ -7,7 +7,7 @@
/include/ "zynq-7000.dtsi"
/ {
- model = "Zynq MicroZED Development Board";
+ model = "Avnet MicroZed board";
compatible = "avnet,zynq-microzed", "xlnx,zynq-7000";
aliases {
diff --git a/arch/arm/boot/dts/zynq-parallella.dts b/arch/arm/boot/dts/zynq-parallella.dts
index c05f4b67d..54592aeb9 100644
--- a/arch/arm/boot/dts/zynq-parallella.dts
+++ b/arch/arm/boot/dts/zynq-parallella.dts
@@ -12,7 +12,7 @@
/include/ "zynq-7000.dtsi"
/ {
- model = "Adapteva Parallella Board";
+ model = "Adapteva Parallella board";
compatible = "adapteva,parallella", "xlnx,zynq-7000";
aliases {
diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts
index f2330b0cb..3f84b94db 100644
--- a/arch/arm/boot/dts/zynq-zc702.dts
+++ b/arch/arm/boot/dts/zynq-zc702.dts
@@ -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 {
diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts
index 3ad1260ff..a15908cac 100644
--- a/arch/arm/boot/dts/zynq-zc706.dts
+++ b/arch/arm/boot/dts/zynq-zc706.dts
@@ -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 {
diff --git a/arch/arm/boot/dts/zynq-zc770-xm010.dts b/arch/arm/boot/dts/zynq-zc770-xm010.dts
index 6884f1ad6..0e1bfdd34 100644
--- a/arch/arm/boot/dts/zynq-zc770-xm010.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm010.dts
@@ -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;
diff --git a/arch/arm/boot/dts/zynq-zc770-xm011.dts b/arch/arm/boot/dts/zynq-zc770-xm011.dts
index b78883cee..b7f65862c 100644
--- a/arch/arm/boot/dts/zynq-zc770-xm011.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm011.dts
@@ -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;
diff --git a/arch/arm/boot/dts/zynq-zc770-xm012.dts b/arch/arm/boot/dts/zynq-zc770-xm012.dts
index c3169d636..d2359b789 100644
--- a/arch/arm/boot/dts/zynq-zc770-xm012.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm012.dts
@@ -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;
diff --git a/arch/arm/boot/dts/zynq-zc770-xm013.dts b/arch/arm/boot/dts/zynq-zc770-xm013.dts
index 8bb66859d..651913f1a 100644
--- a/arch/arm/boot/dts/zynq-zc770-xm013.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm013.dts
@@ -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;
diff --git a/arch/arm/boot/dts/zynq-zed.dts b/arch/arm/boot/dts/zynq-zed.dts
index 98381cc85..bf3e26dbf 100644
--- a/arch/arm/boot/dts/zynq-zed.dts
+++ b/arch/arm/boot/dts/zynq-zed.dts
@@ -7,7 +7,7 @@
#include "zynq-7000.dtsi"
/ {
- model = "Zynq Zed Development Board";
+ model = "Avnet ZedBoard board";
compatible = "avnet,zynq-zed", "xlnx,zynq-7000";
aliases {
diff --git a/arch/arm/boot/dts/zynq-zybo-z7.dts b/arch/arm/boot/dts/zynq-zybo-z7.dts
index 1e713dc98..be40be9b7 100644
--- a/arch/arm/boot/dts/zynq-zybo-z7.dts
+++ b/arch/arm/boot/dts/zynq-zybo-z7.dts
@@ -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 {
diff --git a/arch/arm/boot/dts/zynq-zybo.dts b/arch/arm/boot/dts/zynq-zybo.dts
index a6c00e7fa..0439e9f1e 100644
--- a/arch/arm/boot/dts/zynq-zybo.dts
+++ b/arch/arm/boot/dts/zynq-zybo.dts
@@ -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 {
--
2.18.0
The real name of the board is ZedBoard, from Avnet
Signed-off-by: Luis Araneda <[email protected]>
---
Documentation/devicetree/bindings/arm/xilinx.txt | 2 +-
arch/arm/boot/dts/Makefile | 2 +-
arch/arm/boot/dts/{zynq-zed.dts => zynq-zedboard.dts} | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
rename arch/arm/boot/dts/{zynq-zed.dts => zynq-zedboard.dts} (93%)
diff --git a/Documentation/devicetree/bindings/arm/xilinx.txt b/Documentation/devicetree/bindings/arm/xilinx.txt
index f1e911058..d10adc4d0 100644
--- a/Documentation/devicetree/bindings/arm/xilinx.txt
+++ b/Documentation/devicetree/bindings/arm/xilinx.txt
@@ -30,7 +30,7 @@ Additional compatible strings:
"xlnx,zynq-zc770-xm013"
- Avnet ZedBoard board
- "avnet,zynq-zed"
+ "avnet,zynq-zedboard"
- Digilent Zybo board
"digilent,zynq-zybo"
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 37a3de760..e4c39e26f 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -1108,7 +1108,7 @@ dtb-$(CONFIG_ARCH_ZYNQ) += \
zynq-zc770-xm011.dtb \
zynq-zc770-xm012.dtb \
zynq-zc770-xm013.dtb \
- zynq-zed.dtb \
+ zynq-zedboard.dtb \
zynq-zybo.dtb \
zynq-zybo-z7.dtb
dtb-$(CONFIG_MACH_ARMADA_370) += \
diff --git a/arch/arm/boot/dts/zynq-zed.dts b/arch/arm/boot/dts/zynq-zedboard.dts
similarity index 93%
rename from arch/arm/boot/dts/zynq-zed.dts
rename to arch/arm/boot/dts/zynq-zedboard.dts
index bf3e26dbf..540581c56 100644
--- a/arch/arm/boot/dts/zynq-zed.dts
+++ b/arch/arm/boot/dts/zynq-zedboard.dts
@@ -8,7 +8,7 @@
/ {
model = "Avnet ZedBoard board";
- compatible = "avnet,zynq-zed", "xlnx,zynq-7000";
+ compatible = "avnet,zynq-zedboard", "xlnx,zynq-7000";
aliases {
ethernet0 = &gem0;
--
2.18.0
The value "zynq" isn't officially part of the model on any board.
Additionally, the value is redundant as it's included in a
subsequent value of the property.
Signed-off-by: Luis Araneda <[email protected]>
---
.../devicetree/bindings/arm/xilinx.txt | 22 +++++++++----------
arch/arm/boot/dts/zynq-cc108.dts | 2 +-
arch/arm/boot/dts/zynq-microzed.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-zedboard.dts | 2 +-
arch/arm/boot/dts/zynq-zybo-z7.dts | 2 +-
arch/arm/boot/dts/zynq-zybo.dts | 2 +-
12 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/Documentation/devicetree/bindings/arm/xilinx.txt b/Documentation/devicetree/bindings/arm/xilinx.txt
index d10adc4d0..0785acce4 100644
--- a/Documentation/devicetree/bindings/arm/xilinx.txt
+++ b/Documentation/devicetree/bindings/arm/xilinx.txt
@@ -9,34 +9,34 @@ Required root node properties:
Additional compatible strings:
- Xilinx CC108 board
- "xlnx,zynq-cc108"
+ "xlnx,cc108"
- Avnet MicroZed board
- "avnet,zynq-microzed"
+ "avnet,microzed"
- Adapteva Parallella board
"adapteva,parallella"
- Xilinx ZC702 board
- "xlnx,zynq-zc702"
+ "xlnx,zc702"
- Xilinx ZC706 board
- "xlnx,zynq-zc706"
+ "xlnx,zc706"
- Xilinx ZC770 board, with different FMC cards
- "xlnx,zynq-zc770-xm010"
- "xlnx,zynq-zc770-xm011"
- "xlnx,zynq-zc770-xm012"
- "xlnx,zynq-zc770-xm013"
+ "xlnx,zc770-xm010"
+ "xlnx,zc770-xm011"
+ "xlnx,zc770-xm012"
+ "xlnx,zc770-xm013"
- Avnet ZedBoard board
- "avnet,zynq-zedboard"
+ "avnet,zedboard"
- Digilent Zybo board
- "digilent,zynq-zybo"
+ "digilent,zybo"
- Digilent Zybo Z7 board
- "digilent,zynq-zybo-z7"
+ "digilent,zybo-z7"
---------------------------------------------------------------
diff --git a/arch/arm/boot/dts/zynq-cc108.dts b/arch/arm/boot/dts/zynq-cc108.dts
index 8b9ab9bba..ccff20099 100644
--- a/arch/arm/boot/dts/zynq-cc108.dts
+++ b/arch/arm/boot/dts/zynq-cc108.dts
@@ -13,7 +13,7 @@
/ {
model = "Xilinx CC108 board";
- compatible = "xlnx,zynq-cc108", "xlnx,zynq-7000";
+ compatible = "xlnx,cc108", "xlnx,zynq-7000";
aliases {
ethernet0 = &gem0;
diff --git a/arch/arm/boot/dts/zynq-microzed.dts b/arch/arm/boot/dts/zynq-microzed.dts
index 3cc957428..ef55adb02 100644
--- a/arch/arm/boot/dts/zynq-microzed.dts
+++ b/arch/arm/boot/dts/zynq-microzed.dts
@@ -8,7 +8,7 @@
/ {
model = "Avnet MicroZed board";
- compatible = "avnet,zynq-microzed", "xlnx,zynq-7000";
+ compatible = "avnet,microzed", "xlnx,zynq-7000";
aliases {
ethernet0 = &gem0;
diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts
index 3f84b94db..bd633a9bc 100644
--- a/arch/arm/boot/dts/zynq-zc702.dts
+++ b/arch/arm/boot/dts/zynq-zc702.dts
@@ -8,7 +8,7 @@
/ {
model = "Xilinx ZC702 board";
- compatible = "xlnx,zynq-zc702", "xlnx,zynq-7000";
+ compatible = "xlnx,zc702", "xlnx,zynq-7000";
aliases {
ethernet0 = &gem0;
diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts
index a15908cac..f4805f01b 100644
--- a/arch/arm/boot/dts/zynq-zc706.dts
+++ b/arch/arm/boot/dts/zynq-zc706.dts
@@ -8,7 +8,7 @@
/ {
model = "Xilinx ZC706 board";
- compatible = "xlnx,zynq-zc706", "xlnx,zynq-7000";
+ compatible = "xlnx,zc706", "xlnx,zynq-7000";
aliases {
ethernet0 = &gem0;
diff --git a/arch/arm/boot/dts/zynq-zc770-xm010.dts b/arch/arm/boot/dts/zynq-zc770-xm010.dts
index 0e1bfdd34..21f457656 100644
--- a/arch/arm/boot/dts/zynq-zc770-xm010.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm010.dts
@@ -9,7 +9,7 @@
/ {
model = "Xilinx ZC770 XM010 board";
- compatible = "xlnx,zynq-zc770-xm010", "xlnx,zynq-7000";
+ compatible = "xlnx,zc770-xm010", "xlnx,zynq-7000";
aliases {
ethernet0 = &gem0;
diff --git a/arch/arm/boot/dts/zynq-zc770-xm011.dts b/arch/arm/boot/dts/zynq-zc770-xm011.dts
index b7f65862c..e4a0b2629 100644
--- a/arch/arm/boot/dts/zynq-zc770-xm011.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm011.dts
@@ -9,7 +9,7 @@
/ {
model = "Xilinx ZC770 XM011 board";
- compatible = "xlnx,zynq-zc770-xm011", "xlnx,zynq-7000";
+ compatible = "xlnx,zc770-xm011", "xlnx,zynq-7000";
aliases {
i2c0 = &i2c1;
diff --git a/arch/arm/boot/dts/zynq-zc770-xm012.dts b/arch/arm/boot/dts/zynq-zc770-xm012.dts
index d2359b789..d2ee09590 100644
--- a/arch/arm/boot/dts/zynq-zc770-xm012.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm012.dts
@@ -9,7 +9,7 @@
/ {
model = "Xilinx ZC770 XM012 board";
- compatible = "xlnx,zynq-zc770-xm012", "xlnx,zynq-7000";
+ compatible = "xlnx,zc770-xm012", "xlnx,zynq-7000";
aliases {
i2c0 = &i2c0;
diff --git a/arch/arm/boot/dts/zynq-zc770-xm013.dts b/arch/arm/boot/dts/zynq-zc770-xm013.dts
index 651913f1a..9d6090ee4 100644
--- a/arch/arm/boot/dts/zynq-zc770-xm013.dts
+++ b/arch/arm/boot/dts/zynq-zc770-xm013.dts
@@ -9,7 +9,7 @@
/ {
model = "Xilinx ZC770 XM013 board";
- compatible = "xlnx,zynq-zc770-xm013", "xlnx,zynq-7000";
+ compatible = "xlnx,zc770-xm013", "xlnx,zynq-7000";
aliases {
ethernet0 = &gem1;
diff --git a/arch/arm/boot/dts/zynq-zedboard.dts b/arch/arm/boot/dts/zynq-zedboard.dts
index 540581c56..8a7894552 100644
--- a/arch/arm/boot/dts/zynq-zedboard.dts
+++ b/arch/arm/boot/dts/zynq-zedboard.dts
@@ -8,7 +8,7 @@
/ {
model = "Avnet ZedBoard board";
- compatible = "avnet,zynq-zedboard", "xlnx,zynq-7000";
+ compatible = "avnet,zedboard", "xlnx,zynq-7000";
aliases {
ethernet0 = &gem0;
diff --git a/arch/arm/boot/dts/zynq-zybo-z7.dts b/arch/arm/boot/dts/zynq-zybo-z7.dts
index be40be9b7..bcb633860 100644
--- a/arch/arm/boot/dts/zynq-zybo-z7.dts
+++ b/arch/arm/boot/dts/zynq-zybo-z7.dts
@@ -4,7 +4,7 @@
/ {
model = "Digilent Zybo Z7 board";
- compatible = "digilent,zynq-zybo-z7", "xlnx,zynq-7000";
+ compatible = "digilent,zybo-z7", "xlnx,zynq-7000";
aliases {
ethernet0 = &gem0;
diff --git a/arch/arm/boot/dts/zynq-zybo.dts b/arch/arm/boot/dts/zynq-zybo.dts
index 0439e9f1e..776d3d77d 100644
--- a/arch/arm/boot/dts/zynq-zybo.dts
+++ b/arch/arm/boot/dts/zynq-zybo.dts
@@ -8,7 +8,7 @@
/ {
model = "Digilent Zybo board";
- compatible = "digilent,zynq-zybo", "xlnx,zynq-7000";
+ compatible = "digilent,zybo", "xlnx,zynq-7000";
aliases {
ethernet0 = &gem0;
--
2.18.0
Both boards are made by Avnet, Inc.
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(-)
diff --git a/arch/arm/boot/dts/zynq-microzed.dts b/arch/arm/boot/dts/zynq-microzed.dts
index aa4a0b6de..e40f40a7f 100644
--- a/arch/arm/boot/dts/zynq-microzed.dts
+++ b/arch/arm/boot/dts/zynq-microzed.dts
@@ -8,7 +8,7 @@
/ {
model = "Zynq MicroZED Development Board";
- compatible = "xlnx,zynq-microzed", "xlnx,zynq-7000";
+ compatible = "avnet,zynq-microzed", "xlnx,zynq-7000";
aliases {
ethernet0 = &gem0;
diff --git a/arch/arm/boot/dts/zynq-zed.dts b/arch/arm/boot/dts/zynq-zed.dts
index 53c6883ce..98381cc85 100644
--- a/arch/arm/boot/dts/zynq-zed.dts
+++ b/arch/arm/boot/dts/zynq-zed.dts
@@ -8,7 +8,7 @@
/ {
model = "Zynq Zed Development Board";
- compatible = "xlnx,zynq-zed", "xlnx,zynq-7000";
+ compatible = "avnet,zynq-zed", "xlnx,zynq-7000";
aliases {
ethernet0 = &gem0;
--
2.18.0
The bindings were missing when adding the device-tree files
Also, improve description of existing boards
Signed-off-by: Luis Araneda <[email protected]>
---
.../devicetree/bindings/arm/xilinx.txt | 22 +++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/arm/xilinx.txt b/Documentation/devicetree/bindings/arm/xilinx.txt
index b9043bc35..f1e911058 100644
--- a/Documentation/devicetree/bindings/arm/xilinx.txt
+++ b/Documentation/devicetree/bindings/arm/xilinx.txt
@@ -8,15 +8,33 @@ Required root node properties:
Additional compatible strings:
-- Xilinx internal board cc108
+- Xilinx CC108 board
"xlnx,zynq-cc108"
-- Xilinx internal board zc770 with different FMC cards
+- Avnet MicroZed board
+ "avnet,zynq-microzed"
+
+- Adapteva Parallella board
+ "adapteva,parallella"
+
+- Xilinx ZC702 board
+ "xlnx,zynq-zc702"
+
+- Xilinx ZC706 board
+ "xlnx,zynq-zc706"
+
+- Xilinx ZC770 board, with different FMC cards
"xlnx,zynq-zc770-xm010"
"xlnx,zynq-zc770-xm011"
"xlnx,zynq-zc770-xm012"
"xlnx,zynq-zc770-xm013"
+- Avnet ZedBoard board
+ "avnet,zynq-zed"
+
+- Digilent Zybo board
+ "digilent,zynq-zybo"
+
- Digilent Zybo Z7 board
"digilent,zynq-zybo-z7"
--
2.18.0
On 28.6.2018 07:42, Luis Araneda wrote:
> Both boards are made by Avnet, Inc.
>
> 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(-)
>
> diff --git a/arch/arm/boot/dts/zynq-microzed.dts b/arch/arm/boot/dts/zynq-microzed.dts
> index aa4a0b6de..e40f40a7f 100644
> --- a/arch/arm/boot/dts/zynq-microzed.dts
> +++ b/arch/arm/boot/dts/zynq-microzed.dts
> @@ -8,7 +8,7 @@
>
> / {
> model = "Zynq MicroZED Development Board";
> - compatible = "xlnx,zynq-microzed", "xlnx,zynq-7000";
> + compatible = "avnet,zynq-microzed", "xlnx,zynq-7000";
>
> aliases {
> ethernet0 = &gem0;
> diff --git a/arch/arm/boot/dts/zynq-zed.dts b/arch/arm/boot/dts/zynq-zed.dts
> index 53c6883ce..98381cc85 100644
> --- a/arch/arm/boot/dts/zynq-zed.dts
> +++ b/arch/arm/boot/dts/zynq-zed.dts
> @@ -8,7 +8,7 @@
>
> / {
> model = "Zynq Zed Development Board";
> - compatible = "xlnx,zynq-zed", "xlnx,zynq-7000";
> + compatible = "avnet,zynq-zed", "xlnx,zynq-7000";
>
> aliases {
> ethernet0 = &gem0;
>
Unfortunately we don't know who is parsing this string. It means please
keep that origin compatible string there.
I have no problem with this.
compatible = "avnet,zynq-zed", "xlnx,zynq-zed", "xlnx,zynq-7000";
Thanks,
Michal
On 28.6.2018 07:42, Luis Araneda wrote:
> The bindings were missing when adding the device-tree files
> Also, improve description of existing boards
>
> Signed-off-by: Luis Araneda <[email protected]>
> ---
> .../devicetree/bindings/arm/xilinx.txt | 22 +++++++++++++++++--
> 1 file changed, 20 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/arm/xilinx.txt b/Documentation/devicetree/bindings/arm/xilinx.txt
> index b9043bc35..f1e911058 100644
> --- a/Documentation/devicetree/bindings/arm/xilinx.txt
> +++ b/Documentation/devicetree/bindings/arm/xilinx.txt
> @@ -8,15 +8,33 @@ Required root node properties:
>
> Additional compatible strings:
>
> -- Xilinx internal board cc108
> +- Xilinx CC108 board
No reason to remove internal word from here.
> "xlnx,zynq-cc108"
>
> -- Xilinx internal board zc770 with different FMC cards
> +- Avnet MicroZed board
> + "avnet,zynq-microzed"
> +
> +- Adapteva Parallella board
> + "adapteva,parallella"
> +
> +- Xilinx ZC702 board
> + "xlnx,zynq-zc702"
> +
> +- Xilinx ZC706 board
> + "xlnx,zynq-zc706"
> +
> +- Xilinx ZC770 board, with different FMC cards
> "xlnx,zynq-zc770-xm010"
> "xlnx,zynq-zc770-xm011"
> "xlnx,zynq-zc770-xm012"
> "xlnx,zynq-zc770-xm013"
>
> +- Avnet ZedBoard board
> + "avnet,zynq-zed"
> +
> +- Digilent Zybo board
> + "digilent,zynq-zybo"
> +
> - Digilent Zybo Z7 board
> "digilent,zynq-zybo-z7"
>
>
Not a problem to add missing strings.
Thanks,
Michal
On 28.6.2018 07:42, Luis Araneda wrote:
> The value "zynq" isn't officially part of the model on any board.
> Additionally, the value is redundant as it's included in a
> subsequent value of the property.
>
> Signed-off-by: Luis Araneda <[email protected]>
> ---
> .../devicetree/bindings/arm/xilinx.txt | 22 +++++++++----------
> arch/arm/boot/dts/zynq-cc108.dts | 2 +-
> arch/arm/boot/dts/zynq-microzed.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-zedboard.dts | 2 +-
> arch/arm/boot/dts/zynq-zybo-z7.dts | 2 +-
> arch/arm/boot/dts/zynq-zybo.dts | 2 +-
> 12 files changed, 22 insertions(+), 22 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/arm/xilinx.txt b/Documentation/devicetree/bindings/arm/xilinx.txt
> index d10adc4d0..0785acce4 100644
> --- a/Documentation/devicetree/bindings/arm/xilinx.txt
> +++ b/Documentation/devicetree/bindings/arm/xilinx.txt
> @@ -9,34 +9,34 @@ Required root node properties:
> Additional compatible strings:
>
> - Xilinx CC108 board
> - "xlnx,zynq-cc108"
> + "xlnx,cc108"
>
> - Avnet MicroZed board
> - "avnet,zynq-microzed"
> + "avnet,microzed"
>
> - Adapteva Parallella board
> "adapteva,parallella"
>
> - Xilinx ZC702 board
> - "xlnx,zynq-zc702"
> + "xlnx,zc702"
>
> - Xilinx ZC706 board
> - "xlnx,zynq-zc706"
> + "xlnx,zc706"
>
> - Xilinx ZC770 board, with different FMC cards
> - "xlnx,zynq-zc770-xm010"
> - "xlnx,zynq-zc770-xm011"
> - "xlnx,zynq-zc770-xm012"
> - "xlnx,zynq-zc770-xm013"
> + "xlnx,zc770-xm010"
> + "xlnx,zc770-xm011"
> + "xlnx,zc770-xm012"
> + "xlnx,zc770-xm013"
>
> - Avnet ZedBoard board
> - "avnet,zynq-zedboard"
> + "avnet,zedboard"
>
> - Digilent Zybo board
> - "digilent,zynq-zybo"
> + "digilent,zybo"
>
> - Digilent Zybo Z7 board
> - "digilent,zynq-zybo-z7"
> + "digilent,zybo-z7"
>
> ---------------------------------------------------------------
>
> diff --git a/arch/arm/boot/dts/zynq-cc108.dts b/arch/arm/boot/dts/zynq-cc108.dts
> index 8b9ab9bba..ccff20099 100644
> --- a/arch/arm/boot/dts/zynq-cc108.dts
> +++ b/arch/arm/boot/dts/zynq-cc108.dts
> @@ -13,7 +13,7 @@
>
> / {
> model = "Xilinx CC108 board";
> - compatible = "xlnx,zynq-cc108", "xlnx,zynq-7000";
> + compatible = "xlnx,cc108", "xlnx,zynq-7000";
>
> aliases {
> ethernet0 = &gem0;
> diff --git a/arch/arm/boot/dts/zynq-microzed.dts b/arch/arm/boot/dts/zynq-microzed.dts
> index 3cc957428..ef55adb02 100644
> --- a/arch/arm/boot/dts/zynq-microzed.dts
> +++ b/arch/arm/boot/dts/zynq-microzed.dts
> @@ -8,7 +8,7 @@
>
> / {
> model = "Avnet MicroZed board";
> - compatible = "avnet,zynq-microzed", "xlnx,zynq-7000";
> + compatible = "avnet,microzed", "xlnx,zynq-7000";
>
> aliases {
> ethernet0 = &gem0;
> diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts
> index 3f84b94db..bd633a9bc 100644
> --- a/arch/arm/boot/dts/zynq-zc702.dts
> +++ b/arch/arm/boot/dts/zynq-zc702.dts
> @@ -8,7 +8,7 @@
>
> / {
> model = "Xilinx ZC702 board";
> - compatible = "xlnx,zynq-zc702", "xlnx,zynq-7000";
> + compatible = "xlnx,zc702", "xlnx,zynq-7000";
>
> aliases {
> ethernet0 = &gem0;
> diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts
> index a15908cac..f4805f01b 100644
> --- a/arch/arm/boot/dts/zynq-zc706.dts
> +++ b/arch/arm/boot/dts/zynq-zc706.dts
> @@ -8,7 +8,7 @@
>
> / {
> model = "Xilinx ZC706 board";
> - compatible = "xlnx,zynq-zc706", "xlnx,zynq-7000";
> + compatible = "xlnx,zc706", "xlnx,zynq-7000";
>
> aliases {
> ethernet0 = &gem0;
> diff --git a/arch/arm/boot/dts/zynq-zc770-xm010.dts b/arch/arm/boot/dts/zynq-zc770-xm010.dts
> index 0e1bfdd34..21f457656 100644
> --- a/arch/arm/boot/dts/zynq-zc770-xm010.dts
> +++ b/arch/arm/boot/dts/zynq-zc770-xm010.dts
> @@ -9,7 +9,7 @@
>
> / {
> model = "Xilinx ZC770 XM010 board";
> - compatible = "xlnx,zynq-zc770-xm010", "xlnx,zynq-7000";
> + compatible = "xlnx,zc770-xm010", "xlnx,zynq-7000";
>
> aliases {
> ethernet0 = &gem0;
> diff --git a/arch/arm/boot/dts/zynq-zc770-xm011.dts b/arch/arm/boot/dts/zynq-zc770-xm011.dts
> index b7f65862c..e4a0b2629 100644
> --- a/arch/arm/boot/dts/zynq-zc770-xm011.dts
> +++ b/arch/arm/boot/dts/zynq-zc770-xm011.dts
> @@ -9,7 +9,7 @@
>
> / {
> model = "Xilinx ZC770 XM011 board";
> - compatible = "xlnx,zynq-zc770-xm011", "xlnx,zynq-7000";
> + compatible = "xlnx,zc770-xm011", "xlnx,zynq-7000";
>
> aliases {
> i2c0 = &i2c1;
> diff --git a/arch/arm/boot/dts/zynq-zc770-xm012.dts b/arch/arm/boot/dts/zynq-zc770-xm012.dts
> index d2359b789..d2ee09590 100644
> --- a/arch/arm/boot/dts/zynq-zc770-xm012.dts
> +++ b/arch/arm/boot/dts/zynq-zc770-xm012.dts
> @@ -9,7 +9,7 @@
>
> / {
> model = "Xilinx ZC770 XM012 board";
> - compatible = "xlnx,zynq-zc770-xm012", "xlnx,zynq-7000";
> + compatible = "xlnx,zc770-xm012", "xlnx,zynq-7000";
>
> aliases {
> i2c0 = &i2c0;
> diff --git a/arch/arm/boot/dts/zynq-zc770-xm013.dts b/arch/arm/boot/dts/zynq-zc770-xm013.dts
> index 651913f1a..9d6090ee4 100644
> --- a/arch/arm/boot/dts/zynq-zc770-xm013.dts
> +++ b/arch/arm/boot/dts/zynq-zc770-xm013.dts
> @@ -9,7 +9,7 @@
>
> / {
> model = "Xilinx ZC770 XM013 board";
> - compatible = "xlnx,zynq-zc770-xm013", "xlnx,zynq-7000";
> + compatible = "xlnx,zc770-xm013", "xlnx,zynq-7000";
>
> aliases {
> ethernet0 = &gem1;
> diff --git a/arch/arm/boot/dts/zynq-zedboard.dts b/arch/arm/boot/dts/zynq-zedboard.dts
> index 540581c56..8a7894552 100644
> --- a/arch/arm/boot/dts/zynq-zedboard.dts
> +++ b/arch/arm/boot/dts/zynq-zedboard.dts
> @@ -8,7 +8,7 @@
>
> / {
> model = "Avnet ZedBoard board";
> - compatible = "avnet,zynq-zedboard", "xlnx,zynq-7000";
> + compatible = "avnet,zedboard", "xlnx,zynq-7000";
>
> aliases {
> ethernet0 = &gem0;
> diff --git a/arch/arm/boot/dts/zynq-zybo-z7.dts b/arch/arm/boot/dts/zynq-zybo-z7.dts
> index be40be9b7..bcb633860 100644
> --- a/arch/arm/boot/dts/zynq-zybo-z7.dts
> +++ b/arch/arm/boot/dts/zynq-zybo-z7.dts
> @@ -4,7 +4,7 @@
>
> / {
> model = "Digilent Zybo Z7 board";
> - compatible = "digilent,zynq-zybo-z7", "xlnx,zynq-7000";
> + compatible = "digilent,zybo-z7", "xlnx,zynq-7000";
>
> aliases {
> ethernet0 = &gem0;
> diff --git a/arch/arm/boot/dts/zynq-zybo.dts b/arch/arm/boot/dts/zynq-zybo.dts
> index 0439e9f1e..776d3d77d 100644
> --- a/arch/arm/boot/dts/zynq-zybo.dts
> +++ b/arch/arm/boot/dts/zynq-zybo.dts
> @@ -8,7 +8,7 @@
>
> / {
> model = "Digilent Zybo board";
> - compatible = "digilent,zynq-zybo", "xlnx,zynq-7000";
> + compatible = "digilent,zybo", "xlnx,zynq-7000";
>
> aliases {
> ethernet0 = &gem0;
>
zynq name here is correct which is saying that hardblock is going to be
described. Without it it is suggesting that hardblock is not used and it
is for example on zybo with microblaze.
Thanks,
Michal
On 28.6.2018 07:42, Luis Araneda wrote:
> 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(-)
>
> diff --git a/arch/arm/boot/dts/zynq-cc108.dts b/arch/arm/boot/dts/zynq-cc108.dts
> index 1a0f631c1..8b9ab9bba 100644
> --- a/arch/arm/boot/dts/zynq-cc108.dts
> +++ b/arch/arm/boot/dts/zynq-cc108.dts
> @@ -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;
> diff --git a/arch/arm/boot/dts/zynq-microzed.dts b/arch/arm/boot/dts/zynq-microzed.dts
> index e40f40a7f..3cc957428 100644
> --- a/arch/arm/boot/dts/zynq-microzed.dts
> +++ b/arch/arm/boot/dts/zynq-microzed.dts
> @@ -7,7 +7,7 @@
> /include/ "zynq-7000.dtsi"
>
> / {
> - model = "Zynq MicroZED Development Board";
> + model = "Avnet MicroZed board";
> compatible = "avnet,zynq-microzed", "xlnx,zynq-7000";
>
> aliases {
> diff --git a/arch/arm/boot/dts/zynq-parallella.dts b/arch/arm/boot/dts/zynq-parallella.dts
> index c05f4b67d..54592aeb9 100644
> --- a/arch/arm/boot/dts/zynq-parallella.dts
> +++ b/arch/arm/boot/dts/zynq-parallella.dts
> @@ -12,7 +12,7 @@
> /include/ "zynq-7000.dtsi"
>
> / {
> - model = "Adapteva Parallella Board";
> + model = "Adapteva Parallella board";
> compatible = "adapteva,parallella", "xlnx,zynq-7000";
>
> aliases {
> diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts
> index f2330b0cb..3f84b94db 100644
> --- a/arch/arm/boot/dts/zynq-zc702.dts
> +++ b/arch/arm/boot/dts/zynq-zc702.dts
> @@ -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 {
> diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts
> index 3ad1260ff..a15908cac 100644
> --- a/arch/arm/boot/dts/zynq-zc706.dts
> +++ b/arch/arm/boot/dts/zynq-zc706.dts
> @@ -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 {
> diff --git a/arch/arm/boot/dts/zynq-zc770-xm010.dts b/arch/arm/boot/dts/zynq-zc770-xm010.dts
> index 6884f1ad6..0e1bfdd34 100644
> --- a/arch/arm/boot/dts/zynq-zc770-xm010.dts
> +++ b/arch/arm/boot/dts/zynq-zc770-xm010.dts
> @@ -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;
> diff --git a/arch/arm/boot/dts/zynq-zc770-xm011.dts b/arch/arm/boot/dts/zynq-zc770-xm011.dts
> index b78883cee..b7f65862c 100644
> --- a/arch/arm/boot/dts/zynq-zc770-xm011.dts
> +++ b/arch/arm/boot/dts/zynq-zc770-xm011.dts
> @@ -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;
> diff --git a/arch/arm/boot/dts/zynq-zc770-xm012.dts b/arch/arm/boot/dts/zynq-zc770-xm012.dts
> index c3169d636..d2359b789 100644
> --- a/arch/arm/boot/dts/zynq-zc770-xm012.dts
> +++ b/arch/arm/boot/dts/zynq-zc770-xm012.dts
> @@ -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;
> diff --git a/arch/arm/boot/dts/zynq-zc770-xm013.dts b/arch/arm/boot/dts/zynq-zc770-xm013.dts
> index 8bb66859d..651913f1a 100644
> --- a/arch/arm/boot/dts/zynq-zc770-xm013.dts
> +++ b/arch/arm/boot/dts/zynq-zc770-xm013.dts
> @@ -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;
> diff --git a/arch/arm/boot/dts/zynq-zed.dts b/arch/arm/boot/dts/zynq-zed.dts
> index 98381cc85..bf3e26dbf 100644
> --- a/arch/arm/boot/dts/zynq-zed.dts
> +++ b/arch/arm/boot/dts/zynq-zed.dts
> @@ -7,7 +7,7 @@
> #include "zynq-7000.dtsi"
>
> / {
> - model = "Zynq Zed Development Board";
> + model = "Avnet ZedBoard board";
> compatible = "avnet,zynq-zed", "xlnx,zynq-7000";
>
> aliases {
> diff --git a/arch/arm/boot/dts/zynq-zybo-z7.dts b/arch/arm/boot/dts/zynq-zybo-z7.dts
> index 1e713dc98..be40be9b7 100644
> --- a/arch/arm/boot/dts/zynq-zybo-z7.dts
> +++ b/arch/arm/boot/dts/zynq-zybo-z7.dts
> @@ -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 {
> diff --git a/arch/arm/boot/dts/zynq-zybo.dts b/arch/arm/boot/dts/zynq-zybo.dts
> index a6c00e7fa..0439e9f1e 100644
> --- a/arch/arm/boot/dts/zynq-zybo.dts
> +++ b/arch/arm/boot/dts/zynq-zybo.dts
> @@ -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 {
>
Not a problem with this patch.
M
On 28.6.2018 07:42, Luis Araneda wrote:
> The real name of the board is ZedBoard, from Avnet
>
> Signed-off-by: Luis Araneda <[email protected]>
> ---
> Documentation/devicetree/bindings/arm/xilinx.txt | 2 +-
> arch/arm/boot/dts/Makefile | 2 +-
> arch/arm/boot/dts/{zynq-zed.dts => zynq-zedboard.dts} | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
> rename arch/arm/boot/dts/{zynq-zed.dts => zynq-zedboard.dts} (93%)
>
> diff --git a/Documentation/devicetree/bindings/arm/xilinx.txt b/Documentation/devicetree/bindings/arm/xilinx.txt
> index f1e911058..d10adc4d0 100644
> --- a/Documentation/devicetree/bindings/arm/xilinx.txt
> +++ b/Documentation/devicetree/bindings/arm/xilinx.txt
> @@ -30,7 +30,7 @@ Additional compatible strings:
> "xlnx,zynq-zc770-xm013"
>
> - Avnet ZedBoard board
> - "avnet,zynq-zed"
> + "avnet,zynq-zedboard"
>
> - Digilent Zybo board
> "digilent,zynq-zybo"
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index 37a3de760..e4c39e26f 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -1108,7 +1108,7 @@ dtb-$(CONFIG_ARCH_ZYNQ) += \
> zynq-zc770-xm011.dtb \
> zynq-zc770-xm012.dtb \
> zynq-zc770-xm013.dtb \
> - zynq-zed.dtb \
> + zynq-zedboard.dtb \
> zynq-zybo.dtb \
> zynq-zybo-z7.dtb
> dtb-$(CONFIG_MACH_ARMADA_370) += \
> diff --git a/arch/arm/boot/dts/zynq-zed.dts b/arch/arm/boot/dts/zynq-zedboard.dts
> similarity index 93%
> rename from arch/arm/boot/dts/zynq-zed.dts
> rename to arch/arm/boot/dts/zynq-zedboard.dts
> index bf3e26dbf..540581c56 100644
> --- a/arch/arm/boot/dts/zynq-zed.dts
> +++ b/arch/arm/boot/dts/zynq-zedboard.dts
> @@ -8,7 +8,7 @@
>
> / {
> model = "Avnet ZedBoard board";
> - compatible = "avnet,zynq-zed", "xlnx,zynq-7000";
> + compatible = "avnet,zynq-zedboard", "xlnx,zynq-7000";
>
> aliases {
> ethernet0 = &gem0;
>
It will just cause confusion and I can't see any benefit to rename this
file. If you want to state different compatible string with full board
name I am fine with that but that's it.
Thanks,
Michal
Hi Michal,
On Thu, Jun 28, 2018 at 2:37 AM Michal Simek <[email protected]> wrote:
>
> On 28.6.2018 07:42, Luis Araneda wrote:
> Unfortunately we don't know who is parsing this string. It means please
> keep that origin compatible string there.
>
> I have no problem with this.
> compatible = "avnet,zynq-zed", "xlnx,zynq-zed", "xlnx,zynq-7000";
Ok, I'll change that for V2, and I'll keep it in mind for the rest of
the series too.
Thanks for reviewing,
Luis Araneda.
Hi Michal,
On Thu, Jun 28, 2018 at 2:44 AM Michal Simek <[email protected]> wrote:
> > -- Xilinx internal board cc108
> > +- Xilinx CC108 board
>
> No reason to remove internal word from here.
Ok.
Thanks,
Luis Araneda.
Hi Michal,
On Thu, Jun 28, 2018 at 2:40 AM Michal Simek <[email protected]> wrote:
> > diff --git a/arch/arm/boot/dts/zynq-zed.dts b/arch/arm/boot/dts/zynq-zedboard.dts
> > similarity index 93%
> > rename from arch/arm/boot/dts/zynq-zed.dts
> > rename to arch/arm/boot/dts/zynq-zedboard.dts
> > index bf3e26dbf..540581c56 100644
> > --- a/arch/arm/boot/dts/zynq-zed.dts
> > +++ b/arch/arm/boot/dts/zynq-zedboard.dts
> > @@ -8,7 +8,7 @@
> >
> > / {
> > model = "Avnet ZedBoard board";
> > - compatible = "avnet,zynq-zed", "xlnx,zynq-7000";
> > + compatible = "avnet,zynq-zedboard", "xlnx,zynq-7000";
> >
> > aliases {
> > ethernet0 = &gem0;
> >
>
> It will just cause confusion and I can't see any benefit to rename this
> file. If you want to state different compatible string with full board
> name I am fine with that but that's it.
Ok, I'll drop this patch for V2.
Thanks,
Luis Araneda.
Hi Michal,
On Thu, Jun 28, 2018 at 2:42 AM Michal Simek <[email protected]> wrote:
> zynq name here is correct which is saying that hardblock is going to be
> described. Without it it is suggesting that hardblock is not used and it
> is for example on zybo with microblaze.
In my opinion, the zynq name is just adding redundant information to
the "xlnx,zynq-7000" value.
Taking the Zybo board, the current compatible property is:
> compatible = "digilent,zynq-zybo", "xlnx,zynq-7000";
I'm proposing to change it to:
> compatible = "digilent,zybo", "xlnx,zynq-7000";
(I know I must keep the old value too, I'm simplifying)
In the case of a Zybo board with a microblaze, the property could be:
> compatible = "digilent,zybo", "xlnx,microblaze";
That would allow to differentiate between zynq and microblaze.
I have no problem on dropping the patch if you like. There might be
something that I'm not seeing or a use case that I'm missing.
Thanks,
Luis Araneda.
On Thu, Jun 28, 2018 at 01:42:02AM -0400, Luis Araneda wrote:
> The bindings were missing when adding the device-tree files
> Also, improve description of existing boards
>
> Signed-off-by: Luis Araneda <[email protected]>
> ---
> .../devicetree/bindings/arm/xilinx.txt | 22 +++++++++++++++++--
> 1 file changed, 20 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/arm/xilinx.txt b/Documentation/devicetree/bindings/arm/xilinx.txt
> index b9043bc35..f1e911058 100644
> --- a/Documentation/devicetree/bindings/arm/xilinx.txt
> +++ b/Documentation/devicetree/bindings/arm/xilinx.txt
> @@ -8,15 +8,33 @@ Required root node properties:
>
> Additional compatible strings:
>
> -- Xilinx internal board cc108
> +- Xilinx CC108 board
> "xlnx,zynq-cc108"
>
> -- Xilinx internal board zc770 with different FMC cards
> +- Avnet MicroZed board
> + "avnet,zynq-microzed"
> +
> +- Adapteva Parallella board
> + "adapteva,parallella"
This is documented in adapteva.txt, but I'd prefer if you put it
here and remove adapteva.txt.
> +
> +- Xilinx ZC702 board
> + "xlnx,zynq-zc702"
> +
> +- Xilinx ZC706 board
> + "xlnx,zynq-zc706"
> +
> +- Xilinx ZC770 board, with different FMC cards
> "xlnx,zynq-zc770-xm010"
> "xlnx,zynq-zc770-xm011"
> "xlnx,zynq-zc770-xm012"
> "xlnx,zynq-zc770-xm013"
>
> +- Avnet ZedBoard board
> + "avnet,zynq-zed"
> +
> +- Digilent Zybo board
> + "digilent,zynq-zybo"
> +
> - Digilent Zybo Z7 board
> "digilent,zynq-zybo-z7"
>
> --
> 2.18.0
>
On Tue, Jul 03, 2018 at 03:18:49AM -0400, Luis Araneda wrote:
> Hi Michal,
>
> On Thu, Jun 28, 2018 at 2:42 AM Michal Simek <[email protected]> wrote:
> > zynq name here is correct which is saying that hardblock is going to be
> > described. Without it it is suggesting that hardblock is not used and it
> > is for example on zybo with microblaze.
>
> In my opinion, the zynq name is just adding redundant information to
> the "xlnx,zynq-7000" value.
Maybe so, but you can't just go around changing compatible strings. Once
set, it's an ABI.
Rob
Hi Rob,
Thanks for reviewing.
On Tue, Jul 3, 2018 at 7:04 PM Rob Herring <[email protected]> wrote:
>
> On Thu, Jun 28, 2018 at 01:42:02AM -0400, Luis Araneda wrote:
> > +- Adapteva Parallella board
> > + "adapteva,parallella"
>
> This is documented in adapteva.txt, but I'd prefer if you put it
> here and remove adapteva.txt.
Ouch, I should have used git grep to find that.
I'll remove the adapteva.txt file on v2, which I'll be sending later today.
Thanks,
Luis Araneda.
Hi Rob,
On Tue, Jul 3, 2018 at 7:07 PM Rob Herring <[email protected]> wrote:
> Maybe so, but you can't just go around changing compatible strings. Once
> set, it's an ABI.
Ok, I'll drop the patch from v2.
Thanks,
Luis Araneda.