diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2017-03-30 17:22:40 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-03-30 17:22:40 +0200 |
| commit | 88f31b1d5c27f596ad7ae8048a52e0ef20e46104 (patch) | |
| tree | fb84eeda2e7182a2f28b2bfb050b19fc68f22438 | |
| parent | Merge tag 'omap-for-v4.12/soc-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc (diff) | |
| parent | ARM: gemini: don't select SERIAL_OF_PLATFORM (diff) | |
| download | wireguard-linux-88f31b1d5c27f596ad7ae8048a52e0ef20e46104.tar.xz wireguard-linux-88f31b1d5c27f596ad7ae8048a52e0ef20e46104.zip | |
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
Diffstat (limited to '')
| -rw-r--r-- | arch/arm/mach-gemini/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-gemini/Kconfig b/arch/arm/mach-gemini/Kconfig index a5ee5fbab796..06c8b095154c 100644 --- a/arch/arm/mach-gemini/Kconfig +++ b/arch/arm/mach-gemini/Kconfig @@ -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 |