Commit 4fc116f3 authored by Olof Johansson's avatar Olof Johansson
Browse files

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: default avatarOlof Johansson <olof@lixom.net>
parents b68f95a5 9153bf9f

Documentation/devicetree/bindings/arm/adapteva.txt

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
Adapteva Platforms Device Tree Bindings

---------------------------------------



Parallella board



Required root node properties:

    - compatible = "adapteva,parallella";

Documentation/devicetree/bindings/arm/xilinx.txt

+25 −5
Original line number Diff line number Diff line
@@ -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

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -1115,6 +1115,7 @@ dtb-$(CONFIG_ARCH_ZYNQ) += \ 
	zynq-zc770-xm012.dtb \

	zynq-zc770-xm013.dtb \

	zynq-zed.dtb \

	zynq-zturn.dtb \

	zynq-zybo.dtb \

	zynq-zybo-z7.dtb

dtb-$(CONFIG_MACH_ARMADA_370) += \

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

+1 −1
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ 
/include/ "zynq-7000.dtsi"



/ {

	model = "Zynq MicroZED Development Board";

	compatible = "xlnx,zynq-microzed", "xlnx,zynq-7000";

	model = "Avnet MicroZed board";

	compatible = "avnet,zynq-microzed", "xlnx,zynq-microzed", "xlnx,zynq-7000";



	aliases {

		ethernet0 = &gem0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE