Commit 6ba1c64c authored by Olof Johansson's avatar Olof Johansson

Merge tag 'stm32-soc-for-v4.6-1' of...

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: default avatarOlof Johansson <olof@lixom.net>
parents 7436cf62 f64e9804
...@@ -879,10 +879,16 @@ config ARCH_STM32 ...@@ -879,10 +879,16 @@ config ARCH_STM32
select ARCH_HAS_RESET_CONTROLLER select ARCH_HAS_RESET_CONTROLLER
select ARMV7M_SYSTICK select ARMV7M_SYSTICK
select CLKSRC_STM32 select CLKSRC_STM32
select PINCTRL
select RESET_CONTROLLER select RESET_CONTROLLER
help help
Support for STMicroelectronics STM32 processors. Support for STMicroelectronics STM32 processors.
config MACH_STM32F429
bool "STMicrolectronics STM32F429"
depends on ARCH_STM32
default y
# Definitions to make life easier # Definitions to make life easier
config ARCH_ACORN config ARCH_ACORN
bool bool
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment