Merge tag 'amlogic-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman...

Amlogic SoC changes for v4.8

* tag 'amlogic-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  ARM64: Kconfig: Select the Amlogic Meson pin controller driver

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index b622704..8e0eedc 100644 (file)
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -67,6 +67,8 @@ config ARCH_MEDIATEK
 
 config ARCH_MESON
        bool "Amlogic Platforms"
+       select PINCTRL
+       select PINCTRL_MESON
        help
          This enables support for the Amlogic S905 SoCs.