summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2017-06-18 22:29:29 -0700
committerOlof Johansson <olof@lixom.net>2017-06-18 22:29:29 -0700
commitafa0e3fe34c7c6060f8879b5cc26d57a41ceebaf (patch)
tree5f6f0cd5d0376882ea22380cfcbc576069613aa4 /arch/arm/configs
parentf8a26083ec10d5ca14551e62bbfbfd34b0fd2296 (diff)
parent1d917530c9ed2585cf3ed7db933e85a41b45141f (diff)
downloadlinux-afa0e3fe34c7c6060f8879b5cc26d57a41ceebaf.tar.bz2
Merge tag 'qcom-defconfig-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/defconfig
Qualcomm ARM Based defconfig Updates for v4.13 * Enable IPQ4019 clock and pinctrl * tag 'qcom-defconfig-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux: ARM: qcom_defconfig: Enable IPQ4019 clock and pinctrl Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/qcom_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig
index 07666a7a9de5..33f248058284 100644
--- a/arch/arm/configs/qcom_defconfig
+++ b/arch/arm/configs/qcom_defconfig
@@ -113,6 +113,7 @@ CONFIG_SPI_QUP=y
CONFIG_SPMI=y
CONFIG_PINCTRL_APQ8064=y
CONFIG_PINCTRL_APQ8084=y
+CONFIG_PINCTRL_IPQ4019=y
CONFIG_PINCTRL_IPQ8064=y
CONFIG_PINCTRL_MSM8660=y
CONFIG_PINCTRL_MSM8960=y
@@ -182,6 +183,7 @@ CONFIG_COMMON_CLK_QCOM=y
CONFIG_QCOM_CLK_RPM=y
CONFIG_QCOM_CLK_SMD_RPM=y
CONFIG_APQ_MMCC_8084=y
+CONFIG_IPQ_GCC_4019=y
CONFIG_IPQ_LCC_806X=y
CONFIG_MSM_GCC_8660=y
CONFIG_MSM_LCC_8960=y