diff options
author | 2017-08-19 00:01:03 +0200 | |
---|---|---|
committer | 2017-08-19 00:01:03 +0200 | |
commit | 354865087babf567491846c76e54134161dae518 (patch) | |
tree | 3f7ecc11b14710dd4d4a461ea21fc15120a512fb | |
parent | Merge tag 'arm-soc/for-4.14/defconfig-arm64' of http://github.com/Broadcom/stblinux into next/arm64 (diff) | |
parent | arm64: select PINCTRL for ZTE platform (diff) | |
download | wireguard-linux-354865087babf567491846c76e54134161dae518.tar.xz wireguard-linux-354865087babf567491846c76e54134161dae518.zip |
Merge tag 'zte-soc-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/arm64
Pull "ZTE SoC updates for 4.14" from Shawn Guo:
- Select PINCTRL for ZTE platform, so that pinctrl driver for ZX296718
can be enabled.
* tag 'zte-soc-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
arm64: select PINCTRL for ZTE platform
-rw-r--r-- | arch/arm64/Kconfig.platforms | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index f5f0c813dfec..b65a7e876a26 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -250,6 +250,7 @@ config ARCH_XGENE config ARCH_ZX bool "ZTE ZX SoC Family" + select PINCTRL help This enables support for ZTE ZX SoC Family |