diff options
| author | Linaro CI <ci_notify@linaro.org> | 2018-10-15 06:17:17 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2018-10-15 06:17:17 +0000 |
| commit | 568310096ac233f316d57532429d4b6fd39547a6 (patch) | |
| tree | c0aaf4ca1b983008ad24b3eb07f4ab0803211bbf | |
| parent | b676aaf8c35d212827bf74d3e9cc82c66bc8723c (diff) | |
| parent | 7ec74d1fc102aa89b73e9244195c5667a8416767 (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 fe2b0508542e..c9de8548e1aa 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -350,6 +350,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 @@ -615,6 +616,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 @@ -637,6 +639,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 |