Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-29 14:21:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apseed SoC updates for 4.11

Browse Source 
One commit that selects the newly upstreamed pinctrl driver for all
 SoCs.
 
   ARM: aspeed: Select pinctrl drivers
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJYfprvAAoJEGt2WQeBR3CePVAP/RSVB7PzUqzDDYt7u6sdmjf/
 UrmQtl5IO8Q71pHeNu8QFJom3cu7QDFxxZdFQM7/BqD/6f3mEXESi3bhQPGHaW33
 LIKrGWahSRrPnjQhSq15MzZtxdTKGms/ZhCI6nSXVMEAtIOt6XSunHpFFLzkF1ZH
 xnsBO8WHv3HBFcRovsGkrNOHBbmOwMY/uXUVKJ0ECvHmSjqy/mzvvl55G7rLea4j
 H850rjzywwNZ7qvZtCK3G4F4r1j4nofxgglSR+iCE24K0MGzd9Rzs0w62K/GhXse
 WYEasXeBafIKZlQlWQkPgNOxXXAdNuZ4ywPoxkNuw1MX72vwRIXFAkuSELGcjdjL
 J3yZEhuKLxmyhcaXGxR99w24UgEaO4ebehIwS5Z2mR26Lcp1EeaN8X7+iSFlLUuE
 ylSl7wQY2+ZPZ6wt6tp+F06Wz2wJgHYqqt9cotHiIvkhE1A7X2cX5wNJIH7vBWrJ
 +nxBWz3zPa3osz23dU/sUWZPILbTfGUcOwUzFYHS89hP5z9i+Avzs3j3MOYkBvYf
 czwfMAvh1oLIiMNeTUUOh1kFiJZOgaryrNOD5L0bjapFAIJiXWwIU2kzMQ7pdAES
 iY4HgW7msQupPzGjZ2vyWW0pdGAvb1+TvwUGQ7IxcRSPEOo0v6gnmeUSZ7CIo0HK
 6E1pbdC5Qhkj7ruSaxEs
 =2mLE
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Olof Johansson 2017-01-18 16:23:58 -08:00
commit 37b3785b13
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-aspeed/Kconfig
View File

@ -5,6 +5,8 @@ menuconfig ARCH_ASPEED
select WATCHDOG select WATCHDOG
select ASPEED_WATCHDOG select ASPEED_WATCHDOG
select MOXART_TIMER select MOXART_TIMER
select MFD_SYSCON
select PINCTRL
help help
Say Y here if you want to run your kernel on an ASpeed BMC SoC. 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" bool "Aspeed SoC 4th Generation"
depends on ARCH_MULTI_V5 depends on ARCH_MULTI_V5
select CPU_ARM926T select CPU_ARM926T
select PINCTRL_ASPEED_G4
help help
Say yes if you intend to run on an Aspeed ast2400 or similar Say yes if you intend to run on an Aspeed ast2400 or similar
fourth generation BMCs, such as those used by OpenPower Power8 fourth generation BMCs, such as those used by OpenPower Power8
@ -23,6 +26,7 @@ config MACH_ASPEED_G5
bool "Aspeed SoC 5th Generation" bool "Aspeed SoC 5th Generation"
depends on ARCH_MULTI_V6 depends on ARCH_MULTI_V6
select CPU_V6 select CPU_V6
select PINCTRL_ASPEED_G5
help help
Say yes if you intend to run on an Aspeed ast2500 or similar Say yes if you intend to run on an Aspeed ast2500 or similar
fifth generation Aspeed BMCs. fifth generation Aspeed BMCs.