diff options
author | Olof Johansson <olof@lixom.net> | 2017-06-19 01:29:29 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2017-06-19 01:29:29 -0400 |
commit | afa0e3fe34c7c6060f8879b5cc26d57a41ceebaf (patch) | |
tree | 5f6f0cd5d0376882ea22380cfcbc576069613aa4 | |
parent | f8a26083ec10d5ca14551e62bbfbfd34b0fd2296 (diff) | |
parent | 1d917530c9ed2585cf3ed7db933e85a41b45141f (diff) |
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>
-rw-r--r-- | arch/arm/configs/qcom_defconfig | 2 |
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 | |||
113 | CONFIG_SPMI=y | 113 | CONFIG_SPMI=y |
114 | CONFIG_PINCTRL_APQ8064=y | 114 | CONFIG_PINCTRL_APQ8064=y |
115 | CONFIG_PINCTRL_APQ8084=y | 115 | CONFIG_PINCTRL_APQ8084=y |
116 | CONFIG_PINCTRL_IPQ4019=y | ||
116 | CONFIG_PINCTRL_IPQ8064=y | 117 | CONFIG_PINCTRL_IPQ8064=y |
117 | CONFIG_PINCTRL_MSM8660=y | 118 | CONFIG_PINCTRL_MSM8660=y |
118 | CONFIG_PINCTRL_MSM8960=y | 119 | CONFIG_PINCTRL_MSM8960=y |
@@ -182,6 +183,7 @@ CONFIG_COMMON_CLK_QCOM=y | |||
182 | CONFIG_QCOM_CLK_RPM=y | 183 | CONFIG_QCOM_CLK_RPM=y |
183 | CONFIG_QCOM_CLK_SMD_RPM=y | 184 | CONFIG_QCOM_CLK_SMD_RPM=y |
184 | CONFIG_APQ_MMCC_8084=y | 185 | CONFIG_APQ_MMCC_8084=y |
186 | CONFIG_IPQ_GCC_4019=y | ||
185 | CONFIG_IPQ_LCC_806X=y | 187 | CONFIG_IPQ_LCC_806X=y |
186 | CONFIG_MSM_GCC_8660=y | 188 | CONFIG_MSM_GCC_8660=y |
187 | CONFIG_MSM_LCC_8960=y | 189 | CONFIG_MSM_LCC_8960=y |