diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-30 23:54:57 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-30 23:54:57 +0400 |
| commit | 8b510129bad3974dda864466b5d811c6527dab3d (patch) | |
| tree | 3e8e4d2870bc3b5c407acff4535339080231e7f0 /arch/arm/boot/dts/Makefile | |
| parent | ae171be4e08b86bb24b3591be49d6e29940abff8 (diff) | |
| parent | 6a3246c02e7bcb16a58f3fcee4662a9b36ea80e9 (diff) | |
| download | linux-8b510129bad3974dda864466b5d811c6527dab3d.tar.xz | |
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 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 56751bf0c8ed..0afe09a6bf51 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -458,7 +458,9 @@ dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \ wm8650-mid.dtb \ wm8750-apc8750.dtb \ wm8850-w70v2.dtb -dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb \ +dtb-$(CONFIG_ARCH_ZYNQ) += \ + zynq-parallella.dtb \ + zynq-zc702.dtb \ zynq-zc706.dtb \ zynq-zed.dtb dtb-$(CONFIG_MACH_ARMADA_370) += \ |