diff options
| author | Olof Johansson <olof@lixom.net> | 2016-11-18 21:33:36 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-11-18 21:33:36 +0300 |
| commit | e1cb1c7835e2fc4c025950dc7b98ac22b24a78e9 (patch) | |
| tree | 98e7dd6e5392f01d3657b83d80d09e0e62f1cea0 /arch/arm | |
| parent | 5c55a60eb226c34f8e8fcdb1d2161d3243f5b896 (diff) | |
| parent | 6bc18b83c0c3b5d56137a31ce98ca2802036e7a9 (diff) | |
| download | linux-e1cb1c7835e2fc4c025950dc7b98ac22b24a78e9.tar.xz | |
Merge tag 'soc-for-4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into next/soc
STM32 SOC updates for v4.10, round 1.
Highlights:
----------
- Add new MCU SOC STM32F746
* tag 'soc-for-4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32:
ARM: Kconfig: Introduce MACH_STM32F746 flag
ARM: mach-stm32: Add a new SOC - STM32F746
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/Kconfig | 5 | ||||
| -rw-r--r-- | arch/arm/mach-stm32/board-dt.c | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b5d529fdffab..4353765a592f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -887,6 +887,11 @@ config MACH_STM32F429 depends on ARCH_STM32 default y +config MACH_STM32F746 + bool "STMicrolectronics STM32F746" + depends on ARCH_STM32 + default y + config ARCH_MPS2 bool "ARM MPS2 platform" depends on ARM_SINGLE_ARMV7M diff --git a/arch/arm/mach-stm32/board-dt.c b/arch/arm/mach-stm32/board-dt.c index ceee47735eec..c354222a4158 100644 --- a/arch/arm/mach-stm32/board-dt.c +++ b/arch/arm/mach-stm32/board-dt.c @@ -11,6 +11,7 @@ static const char *const stm32_compat[] __initconst = { "st,stm32f429", "st,stm32f469", + "st,stm32f746", NULL }; |