diff options
| author | Linaro CI <ci_notify@linaro.org> | 2018-11-08 14:24:20 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2018-11-08 14:24:20 +0000 |
| commit | b2969b83829a51c5ebaac406111780d2bee8e177 (patch) | |
| tree | bb11e1ca33f40417fbb16068018937b5e6a418e2 | |
| parent | 5e40e96c94bdc52faf31770c4ef82706a8ff32cf (diff) | |
| parent | 6b52bf64a909fd103124a4f4048db6f8f16a7291 (diff) | |
Merge remote-tracking branch 'qcs404-defconfig/tracking-qcomlt-qcs404-defconfig' into integration-linux-qcomlt
# Conflicts:
# arch/arm64/configs/defconfig
| -rw-r--r-- | arch/arm64/configs/defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index aa8e6e576ff2..d734c3673b56 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -360,6 +360,7 @@ CONFIG_PINCTRL_IPQ8074=y CONFIG_PINCTRL_MSM8916=y CONFIG_PINCTRL_MSM8994=y CONFIG_PINCTRL_MSM8996=y +CONFIG_PINCTRL_QCS404=y CONFIG_PINCTRL_SDM845=y CONFIG_PINCTRL_QDF2XXX=y CONFIG_PINCTRL_QCOM_SPMI_PMIC=y @@ -628,6 +629,7 @@ CONFIG_MSM_GCC_8916=y CONFIG_MSM_GCC_8994=y CONFIG_MSM_MMCC_8996=y CONFIG_QCOM_CLK_APCC_MSM8996=y +CONFIG_QCS_GCC_404=y CONFIG_HWSPINLOCK=y CONFIG_SDM_GCC_845=y CONFIG_HWSPINLOCK_QCOM=y @@ -651,6 +653,7 @@ CONFIG_RPMSG_QCOM_GLINK_SMEM=y CONFIG_RPMSG_QCOM_SMD=y CONFIG_RASPBERRYPI_POWER=y CONFIG_QCOM_RPMH=y +CONFIG_QCOM_GLINK_SSR=m CONFIG_QCOM_SMEM=y CONFIG_QCOM_SMD_RPM=y CONFIG_QCOM_SMP2P=y |