diff options
author | Arnd Bergmann <arnd@arndb.de> | 2017-08-19 01:06:43 +0300 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2017-08-19 01:06:43 +0300 |
commit | f4da0ed9d623255af846b35d601d0207ebe9d3a3 (patch) | |
tree | 5bb63a06e07dfe3addec290dbb35a616f6ff7059 /arch/arm64/configs/defconfig | |
parent | 354865087babf567491846c76e54134161dae518 (diff) | |
parent | dc6159fd04624f5953f833f36428e9c118f4f022 (diff) | |
download | linux-f4da0ed9d623255af846b35d601d0207ebe9d3a3.tar.xz |
Merge tag 'qcom-arm64-defconfig-for-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/arm64
Pull "Qualcomm ARM64 Based defconfig Updates for v4.14" from Andy Gross:
* Enable Qualcomm IPQ8074 clocks and pinctrl
* tag 'qcom-arm64-defconfig-for-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
arm64: defconfig: Enable QCOM IPQ8074 clock and pinctrl
Diffstat (limited to 'arch/arm64/configs/defconfig')
-rw-r--r-- | arch/arm64/configs/defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 21af264730f0..e85d2bda8ef0 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -285,6 +285,7 @@ CONFIG_SPI_ROCKCHIP=y CONFIG_SPI_S3C64XX=y CONFIG_SPI_SPIDEV=m CONFIG_SPMI=y +CONFIG_PINCTRL_IPQ8074=y CONFIG_PINCTRL_SINGLE=y CONFIG_PINCTRL_MAX77620=y CONFIG_PINCTRL_MSM8916=y @@ -486,6 +487,7 @@ CONFIG_CLK_QORIQ=y CONFIG_COMMON_CLK_PWM=y CONFIG_COMMON_CLK_QCOM=y CONFIG_QCOM_CLK_SMD_RPM=y +CONFIG_IPQ_GCC_8074=y CONFIG_MSM_GCC_8916=y CONFIG_MSM_GCC_8994=y CONFIG_MSM_MMCC_8996=y |