Merge tag 'zynq-dt-for-v4.19-v2' of https://github.com/Xilinx/linux-xlnx into next/dt

ARM: dts: zynq: DT changes for v4.19

- Add Z-turn board
- Add mmc aliases
- Fix model information
- Sort out documentatio
- Update Zybo Z7
- Fix gpio-keys

* tag 'zynq-dt-for-v4.19-v2' of https://github.com/Xilinx/linux-xlnx:
  ARM: dts: zynq: Remove #address/#size-cells from gpio-keys
  ARM: dts: zynq: Add LEDs to the Zybo Z7 board
  ARM: dts: zynq: Use gpio constants for the Zybo Z7 board
  ARM: dts: zynq: Fix memory size on the Zybo Z7 board
  dt-bindings: xilinx: zynq: Add missing boards
  dt-bindings: xilinx: zynq: Move Paralella board to Xilinx
  dt-bindings: xilinx: zynq: Sort entries alphabetically
  dt-bindings: xilinx: zynq: Improve boards description
  ARM: dts: zynq: correct and improve the model property of dt files
  ARM: dts: zynq: Set correct manufacturer for ZedBoard and MicroZed boards
  ARM: dts: zynq: Add mmc alias for zc702/zc706/zed/zybo
  ARM: dts: zynq: Add support for Z-turn board

Signed-off-by: Olof Johansson <olof@lixom.net>

2 files changed, 25 insertions, 12 deletions

diff --git a/Documentation/devicetree/bindings/arm/adapteva.txt b/Documentation/devicetree/bindings/arm/adapteva.txt
deleted file mode 100644
index 1d8af9e36065..000000000000
--- a/Documentation/devicetree/bindings/arm/adapteva.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Adapteva Platforms Device Tree Bindings
----------------------------------------
-
-Parallella board
-
-Required root node properties:
-    - compatible = "adapteva,parallella";
diff --git a/Documentation/devicetree/bindings/arm/xilinx.txt b/Documentation/devicetree/bindings/arm/xilinx.txt
index b9043bc35c14..26fe5ecc4332 100644
--- a/Documentation/devicetree/bindings/arm/xilinx.txt
+++ b/Documentation/devicetree/bindings/arm/xilinx.txt
@@ -8,18 +8,38 @@ Required root node properties:
 
 Additional compatible strings:
 
-- Xilinx internal board cc108
+- 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 internal board zc770 with different FMC cards
+- 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"
   "xlnx,zynq-zc770-xm012"
   "xlnx,zynq-zc770-xm013"
 
-- Digilent Zybo Z7 board
-  "digilent,zynq-zybo-z7"
-
 ---------------------------------------------------------------
 
 Xilinx Zynq UltraScale+ MPSoC Platforms Device Tree Bindings