diff options
| author | Olof Johansson <olof@lixom.net> | 2016-12-07 12:38:43 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-12-07 12:38:43 -0800 |
| commit | 8237c0b9570c09d513296ef0fde26ce0784e5179 (patch) | |
| tree | 83035bd77c920c9051a0e3fe9370604a4d3bdde6 /arch/arm/boot/dts/Makefile | |
| parent | dd1551b65023dbe98d1bc77e36000e7aa795e8c7 (diff) | |
| parent | df2f3c48b9cd51e2612a1598342769d09d849f39 (diff) | |
| download | linux-8237c0b9570c09d513296ef0fde26ce0784e5179.tar.gz linux-8237c0b9570c09d513296ef0fde26ce0784e5179.tar.bz2 linux-8237c0b9570c09d513296ef0fde26ce0784e5179.zip | |
Merge tag 'zynq-dt-for-4.10' of https://github.com/Xilinx/linux-xlnx into next/dt
arm: Xilinx Zynq dt patches for v4.10
- Remove skeleton.dtsi
- Fix DTC warnings
- Coding style changes
- Microzed support
* tag 'zynq-dt-for-4.10' of https://github.com/Xilinx/linux-xlnx:
arm: dts: zynq: Add MicroZed board support
ARM: zynq: Fix pmu register description coding style
ARM: zynq: Fix W=1 dtc 1.4 warnings
ARM: zynq: Remove skeleton.dtsi
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 6447abce6fde..cccdbcb557b6 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -923,6 +923,7 @@ dtb-$(CONFIG_ARCH_VT8500) += \ wm8750-apc8750.dtb \ wm8850-w70v2.dtb dtb-$(CONFIG_ARCH_ZYNQ) += \ + zynq-microzed.dtb \ zynq-parallella.dtb \ zynq-zc702.dtb \ zynq-zc706.dtb \ |