diff options
| author | Olof Johansson <olof@lixom.net> | 2017-01-18 16:23:58 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-01-18 16:23:58 -0800 |
| commit | 37b3785b136289b36f5403b4f59b2dc47c35c485 (patch) | |
| tree | 23a83440ab6446953533472941d41bc2dee59f63 | |
| parent | 815133987cc94670e1db9c9f9a6a2284e9e9fd89 (diff) | |
| parent | 43c08c1c1ae576a1517b31c9e3b615104c5ff131 (diff) | |
| download | linux-37b3785b136289b36f5403b4f59b2dc47c35c485.tar.gz linux-37b3785b136289b36f5403b4f59b2dc47c35c485.tar.bz2 linux-37b3785b136289b36f5403b4f59b2dc47c35c485.zip | |
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: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/mach-aspeed/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-aspeed/Kconfig b/arch/arm/mach-aspeed/Kconfig index 5225fbcb250d..f3f8c5c658db 100644 --- a/arch/arm/mach-aspeed/Kconfig +++ b/arch/arm/mach-aspeed/Kconfig @@ -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. |