diff options
| author | Olof Johansson <olof@lixom.net> | 2017-06-19 05:06:32 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-06-19 05:06:32 +0200 |
| commit | d25b45539b902ad383f230709a2bed2e32100cb6 (patch) | |
| tree | 257c481515ef914618b5407b265dd94e39311ea1 /arch/arm/boot/dts/Makefile | |
| parent | Merge tag 'v4.12-next-dts32' of https://github.com/mbgg/linux-mediatek into n... (diff) | |
| parent | ARM: dts: stm32: Add stm32h743i-disco board (diff) | |
| download | linux-d25b45539b902ad383f230709a2bed2e32100cb6.tar.xz linux-d25b45539b902ad383f230709a2bed2e32100cb6.zip | |
Merge tag 'stm32-dt-for-v4.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into next/dt
STM32 DT updates for v4.13, round 1
Highlights:
----------
- Add stm32h743-disco board support
- Add stm32f746-disco board support
- Add stm32f769-disco board support
- Enable LTDC & simple pannel on stm32f429-eval
- Enable Watchdog on stm32f429-eval
- Enable DCMI on stm32f429-eval
- Enable STMPE1600 io expander on stm32f429-eval
- Enable OV2640 camera on stm32f429-eval
- Enable CRC on stm32f429-eval & stm32f429-disco
* tag 'stm32-dt-for-v4.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32:
ARM: dts: stm32: Add stm32h743i-disco board
ARM: dts: stm32: Add usart2 support on stm32h743
ARM: dts: stm32: Add usart2_pins on stm32h743
ARM: dts: stm32: enable CRC32 on stm32429i-eval board
ARM: dts: stm32: enable CRC32 on stm32429-disco board
ARM: dts: stm32: Add CRC support to stm32f429
ARM: dts: stm32: Enable OV2640 camera support of STM32F429-EVAL board
ARM: dts: stm32: Enable STMPE1600 gpio expander of STM32F429-EVAL board
ARM: dts: stm32: Enable DCMI camera interface on STM32F429-EVAL board
ARM: dts: stm32: Enable DCMI support on STM32F429 MCU
ARM: dts: stm32: Add missing reset-cells node in stm32f746
ARM: dts: stm32: Set gpio controller as interrupt controller on F4 and F7
ARM: dts: stm32: Add watchdog support for STM32F429 eval board
ARM: dts: stm32: Add watchdog support for STM32F429 SoC
ARM: dts: stm32: Enable ltdc & simple panel on stm32f429-Eval board
ARM: dts: stm32: Add ltdc support on stm32f429 MCU
ARM: dts: stm32: add stm32f769I & stm32f746 discovery board support
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 741bc8e0eab2..c3ae2e1fd9f4 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -792,9 +792,12 @@ dtb-$(CONFIG_ARCH_STI) += \ dtb-$(CONFIG_ARCH_STM32)+= \ stm32f429-disco.dtb \ stm32f469-disco.dtb \ + stm32f746-disco.dtb \ + stm32f769-disco.dtb \ stm32429i-eval.dtb \ stm32746g-eval.dtb \ - stm32h743i-eval.dtb + stm32h743i-eval.dtb \ + stm32h743i-disco.dtb dtb-$(CONFIG_MACH_SUN4I) += \ sun4i-a10-a1000.dtb \ sun4i-a10-ba10-tvbox.dtb \ |