From: Olof Johansson Date: Mon, 20 Jun 2016 05:43:50 +0000 (-0700) Subject: Merge tag 'arm-soc/for-4.8/soc-arm64' of http://github.com/Broadcom/stblinux into... X-Git-Tag: v4.8-rc1~69^2~12 X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=cfa999ef5bd2ee91ac419b4de2aca24d3a5d35ac;hp=-c;p=cascardo%2Flinux.git Merge tag 'arm-soc/for-4.8/soc-arm64' of github.com/Broadcom/stblinux into next/arm64 This pull request contains SoC changes for Broadcom ARM64-based SoCs: - Kamlakant updates the Broadcom Vulcan Kconfig entry with GPIOLIB to enable GPIO on these platforms * tag 'arm-soc/for-4.8/soc-arm64' of http://github.com/Broadcom/stblinux: arm64: vulcan: enable GPIOLIB in Kconfig Signed-off-by: Olof Johansson --- cfa999ef5bd2ee91ac419b4de2aca24d3a5d35ac diff --combined arch/arm64/Kconfig.platforms index 8e0eedc39ed3,33892f2320cc..f5e7db6d6b2e --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@@ -36,7 -36,6 +36,7 @@@ config ARCH_EXYNO select HAVE_S3C_RTC if RTC_CLASS select PINCTRL select PINCTRL_EXYNOS + select SOC_SAMSUNG help This enables support for ARMv8 based Samsung Exynos SoC family. @@@ -67,8 -66,6 +67,8 @@@ config ARCH_MEDIATE config ARCH_MESON bool "Amlogic Platforms" + select PINCTRL + select PINCTRL_MESON help This enables support for the Amlogic S905 SoCs. @@@ -171,6 -168,7 +171,7 @@@ config ARCH_VEXPRES config ARCH_VULCAN bool "Broadcom Vulcan SOC Family" + select GPIOLIB help This enables support for Broadcom Vulcan SoC Family