diff options
| author | Linaro CI <ci_notify@linaro.org> | 2018-11-07 13:52:05 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2018-11-07 13:52:05 +0000 |
| commit | d37853fc8cb342e71dd65ce972496b7dc87a5431 (patch) | |
| tree | f04e30da9e25e66b43ad410a37769272b042a3b1 | |
| parent | dd1f1e6c5cea118d3429ce13f3fb662568bc9caf (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 a5abc5f027b5..a7f65dda0a0f 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -361,6 +361,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 @@ -629,6 +630,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 @@ -652,6 +654,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 |