summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorAndy Gross <andy.gross@linaro.org>2017-06-23 13:29:31 -0500
committerAndy Gross <andy.gross@linaro.org>2017-06-23 13:29:31 -0500
commit0a932693c95ed5ed22506f09af084d8d3c299393 (patch)
tree40652bdde05e4c34ffd46c76a540a0a0970f7c1a /arch/arm
parent2ea659a9ef488125eb46da6eb571de5eae5c43f6 (diff)
parent1d917530c9ed2585cf3ed7db933e85a41b45141f (diff)
Merge tag 'qcom-defconfig-for-4.13' into defconfig-for-4.13-2
Qualcomm ARM Based defconfig Updates for v4.13 * Enable IPQ4019 clock and pinctrl
Diffstat (limited to 'arch/arm')
-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