diff options
| author | Linaro CI <ci_notify@linaro.org> | 2021-02-22 12:18:00 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2021-02-22 12:18:00 +0000 |
| commit | 00dc150d4342e5646086505609d425d312c7f447 (patch) | |
| tree | ac8594d58a07fd130242a9cd052729065e888374 | |
| parent | fe0669fe8013eebb69ad5f5609cc3b9db43f9a2f (diff) | |
| parent | 3c47493b77f046dbbcfff510f2a2bb867dd37a3f (diff) | |
Merge remote-tracking branch 'sm8350-defconfig/tracking-qcomlt-sm8350-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 74e9f4b2e1f8..a6f6f5afa0af 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -523,6 +523,7 @@ CONFIG_PINCTRL_SC7180=y CONFIG_PINCTRL_SDM845=y CONFIG_PINCTRL_SM8150=y CONFIG_PINCTRL_SM8250=y +CONFIG_PINCTRL_SM8350=y CONFIG_PINCTRL_LPASS_LPI=y CONFIG_GPIO_ALTERA=m CONFIG_GPIO_DAVINCI=y @@ -969,6 +970,7 @@ CONFIG_SDM_VIDEOCC_845=y CONFIG_SDM_DISPCC_845=y CONFIG_SM_GCC_8150=y CONFIG_SM_GCC_8250=y +CONFIG_SM_GCC_8350=y CONFIG_SM_GPUCC_8150=y CONFIG_SM_GPUCC_8250=y CONFIG_SM_DISPCC_8250=y @@ -1135,6 +1137,7 @@ CONFIG_INTERCONNECT_QCOM_SC7180=m CONFIG_INTERCONNECT_QCOM_SDM845=m CONFIG_INTERCONNECT_QCOM_SM8150=m CONFIG_INTERCONNECT_QCOM_SM8250=m +CONFIG_INTERCONNECT_QCOM_SM8350=y CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y CONFIG_EXT4_FS_POSIX_ACL=y |