diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-03-07 16:34:22 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-03-07 16:34:22 +0100 |
| commit | dfbecbc7b6bcb27d809cf011df609d5d4d1c012c (patch) | |
| tree | d480a49e8cdee3d42f217a80bef668004ff31f99 /arch/arm/boot/dts/Makefile | |
| parent | 0517a0934e45d083adb31fd79ae48a49cadfa1d4 (diff) | |
| parent | 193ca00b820c9d95955ba36e3882f4a060e2559e (diff) | |
| download | op-kernel-dev-dfbecbc7b6bcb27d809cf011df609d5d4d1c012c.zip op-kernel-dev-dfbecbc7b6bcb27d809cf011df609d5d4d1c012c.tar.gz | |
Merge tag 'stm32-dt-for-v4.17-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into next/dt
Pull "STM32 DT updates for v4.17, round 1" from Alexandre Torgue:
Highlights:
-----------
-Add support of STM32MP157 MPU and stm32mp157c eval board
-Add SD supports on F4 and F7 boards
-Add leds support on stm32f469 and stm32f769 disco boards
-Add push button support on stm32f469 and stm32f769 disco boards
-Add EXTI, SPI, RTC, USB HS/FS support on STM32H743 MCU
-Add RTC and USB OTG HS on stm32f769-disco
-Use dedicated files for F7 pinctrl
* tag 'stm32-dt-for-v4.17-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32: (34 commits)
ARM: dts: stm32: Fix sdio2 rcc hard coded value
dt-bindings: mfd: Add STM32F7 SDMMC2 rcc entry
ARM: dts: stm32: Enable sdio1 for stm32f769-disco
ARM: dts: stm32: Enable sdio1 for stm32f746-eval
ARM: dts: stm32: Enable sdio1 for stm32f746-disco
ARM: dts: stm32: Add sdio pins definition for stm32f7
ARM: dts: stm32: add SPI support on STM32H743 SoC
ARM: dts: stm32: enable RTC on stm32h743i-eval
ARM: dts: stm32: add RTC support on STM32H743
ARM: dts: stm32: enable USB OTG HS on stm32h743i-eval
ARM: dts: stm32: add USB OTG HS and FS support for STM32H743 SoC
ARM: dts: stm32: enable RTC on stm32f769-disco
ARM: dts: stm32: enable USB HS on stm32f769-disco
ARM: dts: stm32: select otg mode for usbotg_hs on stm32746g_eval
ARM: dts: stm32: add gadget fifo sizes to usbotg_hs on stm32f746
ARM: dts: stm32: Add push button to stm32f769 Discovery board
ARM: dts: stm32: Add push button to stm32f469 Discovery board
ARM: dts: stm32: Add leds support to stm32f769 Discovery board
ARM: dts: stm32: Add leds support to stm32f469 Discovery board
ARM: dts: stm32: Fix HSE clock frequency for stm32h743i-disco board
...
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index b4469995..9223ac1 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -866,7 +866,7 @@ dtb-$(CONFIG_ARCH_STI) += \ stih410-b2120.dtb \ stih410-b2260.dtb \ stih418-b2199.dtb -dtb-$(CONFIG_ARCH_STM32)+= \ +dtb-$(CONFIG_ARCH_STM32) += \ stm32f429-disco.dtb \ stm32f469-disco.dtb \ stm32f746-disco.dtb \ @@ -874,7 +874,9 @@ dtb-$(CONFIG_ARCH_STM32)+= \ stm32429i-eval.dtb \ stm32746g-eval.dtb \ stm32h743i-eval.dtb \ - stm32h743i-disco.dtb + stm32h743i-disco.dtb \ + stm32mp157c-ed1.dtb \ + stm32mp157c-ev1.dtb dtb-$(CONFIG_MACH_SUN4I) += \ sun4i-a10-a1000.dtb \ sun4i-a10-ba10-tvbox.dtb \ |
