diff options
author | Olof Johansson <olof@lixom.net> | 2017-04-19 09:27:10 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2017-04-19 09:27:10 -0400 |
commit | 286d3ac582e9082af096407562a2b522f5c8a367 (patch) | |
tree | 00c5ccb50b1f806bab878d37fe3e5eb27a96e553 | |
parent | 9479f95f320cb35cce17859d2c3a5d29679dad50 (diff) | |
parent | 806766915051b43b783cc5621a6ea3a1e5e84aee (diff) |
Merge tag 'qcom-defconfig-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/defconfig
Qualcomm ARM Based defconfig Updates for v4.12
* Enable QCOM remoteproc and related drivers
* tag 'qcom-defconfig-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
ARM: qcom_defconfig: Enable Qualcomm remoteproc and related drivers
Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r-- | arch/arm/configs/qcom_defconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig index 4ffdd607205d..07666a7a9de5 100644 --- a/arch/arm/configs/qcom_defconfig +++ b/arch/arm/configs/qcom_defconfig | |||
@@ -190,11 +190,18 @@ CONFIG_MDM_LCC_9615=y | |||
190 | CONFIG_MSM_MMCC_8960=y | 190 | CONFIG_MSM_MMCC_8960=y |
191 | CONFIG_MSM_MMCC_8974=y | 191 | CONFIG_MSM_MMCC_8974=y |
192 | CONFIG_HWSPINLOCK_QCOM=y | 192 | CONFIG_HWSPINLOCK_QCOM=y |
193 | CONFIG_REMOTEPROC=y | ||
194 | CONFIG_QCOM_ADSP_PIL=y | ||
195 | CONFIG_QCOM_Q6V5_PIL=y | ||
196 | CONFIG_QCOM_WCNSS_PIL=y | ||
193 | CONFIG_QCOM_GSBI=y | 197 | CONFIG_QCOM_GSBI=y |
194 | CONFIG_QCOM_PM=y | 198 | CONFIG_QCOM_PM=y |
195 | CONFIG_QCOM_SMEM=y | 199 | CONFIG_QCOM_SMEM=y |
196 | CONFIG_QCOM_SMD=y | 200 | CONFIG_QCOM_SMD=y |
197 | CONFIG_QCOM_SMD_RPM=y | 201 | CONFIG_QCOM_SMD_RPM=y |
202 | CONFIG_QCOM_SMP2P=y | ||
203 | CONFIG_QCOM_SMSM=y | ||
204 | CONFIG_QCOM_WCNSS_CTRL=y | ||
198 | CONFIG_IIO=y | 205 | CONFIG_IIO=y |
199 | CONFIG_IIO_BUFFER_CB=y | 206 | CONFIG_IIO_BUFFER_CB=y |
200 | CONFIG_IIO_SW_TRIGGER=y | 207 | CONFIG_IIO_SW_TRIGGER=y |