diff options
author | Olof Johansson <olof@lixom.net> | 2016-06-14 10:31:31 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2016-06-14 10:31:31 -0700 |
commit | 97e80da3158126591c8a8d3fed922fe53c872003 (patch) | |
tree | bca0371bba666388f7b043d5c41b8fb037853634 /arch/arm64/Kconfig.platforms | |
parent | 16740e7f89fb74253b5897a7525c68becee65beb (diff) | |
parent | bf56c7762df2ef60512eb58c5f4525d173a4da22 (diff) | |
download | op-kernel-dev-97e80da3158126591c8a8d3fed922fe53c872003.zip op-kernel-dev-97e80da3158126591c8a8d3fed922fe53c872003.tar.gz |
Merge tag 'amlogic-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/arm64
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>
Diffstat (limited to 'arch/arm64/Kconfig.platforms')
-rw-r--r-- | arch/arm64/Kconfig.platforms | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index b622704..8e0eedc 100644 --- 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. |