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

Commit 37b3785b authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'aspeed-4.11-soc' of... 

Merge tag 'aspeed-4.11-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed into next/soc

Apseed SoC updates for 4.11

One commit that selects the newly upstreamed pinctrl driver for all
SoCs.

* tag 'aspeed-4.11-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed

:
  ARM: aspeed: Select pinctrl drivers

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 81513398 43c08c1c

arch/arm/mach-aspeed/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ menuconfig ARCH_ASPEED 
	select WATCHDOG

	select ASPEED_WATCHDOG

	select MOXART_TIMER

	select MFD_SYSCON

	select PINCTRL

	help

	  Say Y here if you want to run your kernel on an ASpeed BMC SoC.
@@ -14,6 +16,7 @@ config MACH_ASPEED_G4 
	bool "Aspeed SoC 4th Generation"

	depends on ARCH_MULTI_V5

	select CPU_ARM926T

	select PINCTRL_ASPEED_G4

	help

	 Say yes if you intend to run on an Aspeed ast2400 or similar

	 fourth generation BMCs, such as those used by OpenPower Power8
@@ -23,6 +26,7 @@ config MACH_ASPEED_G5 
	bool "Aspeed SoC 5th Generation"

	depends on ARCH_MULTI_V6

	select CPU_V6

	select PINCTRL_ASPEED_G5

	help

	 Say yes if you intend to run on an Aspeed ast2500 or similar

	 fifth generation Aspeed BMCs.