diff options
| author | Olof Johansson <olof@lixom.net> | 2016-02-24 13:47:45 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-02-24 13:47:45 -0800 |
| commit | 6ba1c64cd2de65add25eeb168ac6c497967da9a3 (patch) | |
| tree | b4645876753a69d600668e9fe8119ccf1aa18ef2 | |
| parent | 7436cf625eaa5c83f1975225141ec1d638f6fdfe (diff) | |
| parent | f64e980450027e15dce5e9ec4ee19bab98aee4c5 (diff) | |
| download | lwn-6ba1c64cd2de65add25eeb168ac6c497967da9a3.tar.gz lwn-6ba1c64cd2de65add25eeb168ac6c497967da9a3.zip | |
Merge tag 'stm32-soc-for-v4.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/stm32 into next/soc
Highlights:
-----------
- Make STM32 to select PINCTRL
- Introduce MACH_STM32F429 flag
* tag 'stm32-soc-for-v4.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/stm32:
ARM: mach-stm32: Select pinctrl
ARM: Kconfig: Introduce MACH_STM32F429 flag
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 4f799e567fc8..84b7291de5c2 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -879,10 +879,16 @@ config ARCH_STM32 select ARCH_HAS_RESET_CONTROLLER select ARMV7M_SYSTICK select CLKSRC_STM32 + select PINCTRL select RESET_CONTROLLER help Support for STMicroelectronics STM32 processors. +config MACH_STM32F429 + bool "STMicrolectronics STM32F429" + depends on ARCH_STM32 + default y + # Definitions to make life easier config ARCH_ACORN bool |