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

Commit d4e508c2 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'gemini-for-arm-soc-1' of... 

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
parents 945b7691 2cdbd763

arch/arm/mach-gemini/Kconfig

+5 −0
Original line number Original line Diff line number Diff line 
menuconfig ARCH_GEMINI

menuconfig ARCH_GEMINI

	bool "Cortina Systems Gemini"

	bool "Cortina Systems Gemini"

	depends on ARCH_MULTI_V4

	depends on ARCH_MULTI_V4

	select ARCH_HAS_RESET_CONTROLLER

	select ARM_AMBA

	select ARM_APPENDED_DTB # Old Redboot bootloaders deployed

	select ARM_APPENDED_DTB # Old Redboot bootloaders deployed

	select COMMON_CLK_GEMINI

	select FARADAY_FTINTC010

	select FARADAY_FTINTC010

	select FTTMR010_TIMER

	select FTTMR010_TIMER

	select GPIO_FTGPIO010

	select GPIO_FTGPIO010

	select GPIOLIB

	select GPIOLIB

	select PINCTRL

	select PINCTRL_GEMINI

	select POWER_RESET

	select POWER_RESET

	select POWER_RESET_GEMINI_POWEROFF

	select POWER_RESET_GEMINI_POWEROFF

	select POWER_RESET_SYSCON

	select POWER_RESET_SYSCON