Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/arm/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -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