diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-12-04 16:48:36 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-12-04 16:48:36 +0100 |
| commit | f3507cc5865bddc5b690cd5991c3d6a151846905 (patch) | |
| tree | a25872b69ba93a344c0a1990266eb8f7feef6bfe /arch/arm/boot/dts/Makefile | |
| parent | Merge tag 'bcm5301x-dt-2014-11-27' of https://github.com/hauke/linux into nex... (diff) | |
| parent | arm: dts: zynq: Add Digilent ZYBO board (diff) | |
| download | linux-f3507cc5865bddc5b690cd5991c3d6a151846905.tar.xz linux-f3507cc5865bddc5b690cd5991c3d6a151846905.zip | |
Merge tag 'zynq-dt-for-3.19' of https://github.com/Xilinx/linux-xlnx into next/dt
Pull "arm: Xilinx Zynq dt patches for v3.19" from Michal Simek:
- Declare Digilent and vendor
- Add Zybo board support
- Fix VDMA documentation to be align with the driver
* tag 'zynq-dt-for-3.19' of https://github.com/Xilinx/linux-xlnx:
arm: dts: zynq: Add Digilent ZYBO board
arm: dts: zynq: Move crystal freq. to board level
doc: dt: vendor-prefixes: Add Digilent Inc
Documentation: devicetree: Fix Xilinx VDMA specification
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 35f3e122f3a4..0dd08c9ec55d 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -515,7 +515,8 @@ dtb-$(CONFIG_ARCH_ZYNQ) += \ zynq-parallella.dtb \ zynq-zc702.dtb \ zynq-zc706.dtb \ - zynq-zed.dtb + zynq-zed.dtb \ + zynq-zybo.dtb dtb-$(CONFIG_MACH_ARMADA_370) += \ armada-370-db.dtb \ armada-370-mirabox.dtb \ |