diff options
| author | Olof Johansson <olof@lixom.net> | 2017-01-18 16:17:26 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-01-18 16:17:26 -0800 |
| commit | 28e603b2ad829f8320b804f825dfba4a9303d5bd (patch) | |
| tree | f8e0aaff58b871339685787b336f51329f09aa27 /arch/arm/boot/dts/Makefile | |
| parent | c2b360449e4799f165ee1135a3c9f545b86e2bbe (diff) | |
| parent | 21dd0ece34c2a07432a1cd0bbcb4815ce2b49173 (diff) | |
| download | lwn-28e603b2ad829f8320b804f825dfba4a9303d5bd.tar.gz lwn-28e603b2ad829f8320b804f825dfba4a9303d5bd.zip | |
Merge tag 'at91-ab-4.11-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/dt
DT for 4.11:
- New boards: Axentia TSE-850, sama5d36ek CMP
- new device definitions for sama5d2
- Fix DMA allocation on sama5d4 for secure peripherals
* tag 'at91-ab-4.11-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
ARM: dts: at91: add devicetree for the Axentia TSE-850
ARM: dts: at91: add dts file for sama5d36ek CMP board
ARM: dts: at91: sama5d2: add ssc0 definition
ARM: dts: at91: sama5d2 Xplained: use DMA for UART3
ARM: dts: at91: sama5d2: move UART3 to DMA1
ARM: dts: at91: add dma1 definition to sama5d2
ARM: dts: at91: sama5d4 Xplained: enable UART1 node with DMA
ARM: dts: at91: sama5d4: change DMA allocation for secure peripherals
ARM: dts: at91: sama5d3_uart: fix reg sizes to match documentation
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 4d16b44b431a..bbd03c6b10f0 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -48,11 +48,13 @@ dtb-$(CONFIG_SOC_SAM_V7) += \ at91-kizbox2.dtb \ at91-sama5d2_xplained.dtb \ at91-sama5d3_xplained.dtb \ + at91-tse850-3.dtb \ sama5d31ek.dtb \ sama5d33ek.dtb \ sama5d34ek.dtb \ sama5d35ek.dtb \ sama5d36ek.dtb \ + sama5d36ek_cmp.dtb \ at91-sama5d4_ma5d4evk.dtb \ at91-sama5d4_xplained.dtb \ at91-sama5d4ek.dtb \ |