diff options
author | Olof Johansson <olof@lixom.net> | 2014-07-30 15:54:57 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-07-30 15:54:57 -0400 |
commit | 8b510129bad3974dda864466b5d811c6527dab3d (patch) | |
tree | 3e8e4d2870bc3b5c407acff4535339080231e7f0 /Documentation/devicetree/bindings/arm | |
parent | ae171be4e08b86bb24b3591be49d6e29940abff8 (diff) | |
parent | 6a3246c02e7bcb16a58f3fcee4662a9b36ea80e9 (diff) |
Merge tag 'zynq-dt-for-3.17-3' of git://git.xilinx.com/linux-xlnx into next/dt
Merge "Xilinx Zynq dt changes for v3.17 - third pull request" from Michal
Simek:
arm: Xilinx Zynq dt patches for v3.17 third pull request
- Add Adapteva Parallella board/DT
- Add SPI nodes
- Add CAN nodes
- Clean Zynq description
* tag 'zynq-dt-for-3.17-3' of git://git.xilinx.com/linux-xlnx:
ARM: zynq: DT: Clarify Xilinx Zynq platform
ARM: zynq: DT: Remove DMA from board DTs
ARM: zynq: DT: Add CAN node
ARM: dts: zynq: Add SPI
ARM: dts: zynq: Add DMAC for Parallella
ARM: dts: zynq: Add Parallella device tree
Documentation: devicetree: Adapteva boards
Documentation: devicetree: Adapteva vendor prefix
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation/devicetree/bindings/arm')
-rw-r--r-- | Documentation/devicetree/bindings/arm/adapteva.txt | 7 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/arm/xilinx.txt | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/arm/adapteva.txt b/Documentation/devicetree/bindings/arm/adapteva.txt new file mode 100644 index 000000000000..1d8af9e36065 --- /dev/null +++ b/Documentation/devicetree/bindings/arm/adapteva.txt | |||
@@ -0,0 +1,7 @@ | |||
1 | Adapteva Platforms Device Tree Bindings | ||
2 | --------------------------------------- | ||
3 | |||
4 | Parallella board | ||
5 | |||
6 | Required root node properties: | ||
7 | - compatible = "adapteva,parallella"; | ||
diff --git a/Documentation/devicetree/bindings/arm/xilinx.txt b/Documentation/devicetree/bindings/arm/xilinx.txt index 6f1ed830b4f7..1f7995357888 100644 --- a/Documentation/devicetree/bindings/arm/xilinx.txt +++ b/Documentation/devicetree/bindings/arm/xilinx.txt | |||
@@ -1,7 +1,7 @@ | |||
1 | Xilinx Zynq EP107 Emulation Platform board | 1 | Xilinx Zynq Platforms Device Tree Bindings |
2 | 2 | ||
3 | This board is an emulation platform for the Zynq product which is | 3 | Boards with Zynq-7000 SOC based on an ARM Cortex A9 processor |
4 | based on an ARM Cortex A9 processor. | 4 | shall have the following properties. |
5 | 5 | ||
6 | Required root node properties: | 6 | Required root node properties: |
7 | - compatible = "xlnx,zynq-ep107"; | 7 | - compatible = "xlnx,zynq-7000"; |