diff options
| author | Arnd Bergmann <[email protected]> | 2017-08-16 22:41:23 +0200 |
|---|---|---|
| committer | Arnd Bergmann <[email protected]> | 2017-08-16 22:41:23 +0200 |
| commit | d4e508c298f36e7b48872cba49c81ec4f329d504 (patch) | |
| tree | 1dd641e25c02c98d2f4928b0ff2f05702ea498c8 | |
| parent | 945b7691a27518619a9ce222eb30e28594e773af (diff) | |
| parent | 2cdbd763f21378c49feca334b4e0d119c799a0ff (diff) | |
Merge tag 'gemini-for-arm-soc-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/soc
Pull "Gemini changes for v4.14" from Linus Walleij:
They all deal with fixing up the Kconfig selects
for misc stuff that has been merged in different
subsystems:
- We have a reset controller
- We have a clock controller
- We need ARM_AMBA for FTDMAC020 which is PL08x
- We need to select the pin controller (being merged
for v4.14)
* tag 'gemini-for-arm-soc-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
ARM: gemini: select pin controller
ARM: gemini: select ARM_AMBA
ARM: gemini: select the clock controller
ARM: gemini: tag the arch as having reset controller
| -rw-r--r-- | arch/arm/mach-gemini/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-gemini/Kconfig b/arch/arm/mach-gemini/Kconfig index 06c8b095154c..70106b67631c 100644 --- a/arch/arm/mach-gemini/Kconfig +++ b/arch/arm/mach-gemini/Kconfig @@ -1,11 +1,16 @@ menuconfig ARCH_GEMINI bool "Cortina Systems Gemini" depends on ARCH_MULTI_V4 + select ARCH_HAS_RESET_CONTROLLER + select ARM_AMBA select ARM_APPENDED_DTB # Old Redboot bootloaders deployed + select COMMON_CLK_GEMINI select FARADAY_FTINTC010 select FTTMR010_TIMER select GPIO_FTGPIO010 select GPIOLIB + select PINCTRL + select PINCTRL_GEMINI select POWER_RESET select POWER_RESET_GEMINI_POWEROFF select POWER_RESET_SYSCON |