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

Commit 88f31b1d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'gemini-multiplat-2' of... 

Merge tag 'gemini-multiplat-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/soc

Pull "Gemini multiplatform updates" from Linus Walleij:

- Select the poweroff driver so the system can properly shut down.
  This driver is merged in the power tree.
- Select the right Faraday GPIO block (we renamed it).
- Do not select SERIAL_OF_PLATFORM that just create Kconfig
  warnings on us. We'll put that into the defconfig instead.

* tag 'gemini-multiplat-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: gemini: don't select SERIAL_OF_PLATFORM
  ARM: gemini: select the right GPIO block
  ARM: gemini: select gemini poweroff
parents 59bc516c 16c86ef7

arch/arm/mach-gemini/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -4,10 +4,10 @@ menuconfig ARCH_GEMINI 
	select ARM_APPENDED_DTB # Old Redboot bootloaders deployed

	select FARADAY_FTINTC010

	select FTTMR010_TIMER

	select GPIO_GEMINI

	select GPIO_FTGPIO010

	select GPIOLIB

	select POWER_RESET

	select POWER_RESET_GEMINI_POWEROFF

	select POWER_RESET_SYSCON

	select SERIAL_OF_PLATFORM

	help

	  Support for the Cortina Systems Gemini family SoCs