diff options
| author | Linaro CI <ci_notify@linaro.org> | 2021-03-15 14:14:08 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2021-03-15 14:14:08 +0000 |
| commit | 354781ea06002aa4afdc12bb7c200757256c2f54 (patch) | |
| tree | a356e2ab17eda75286423eb333ccdff9827622d6 | |
| parent | 5103169fa0bcd762b5878346da84cdb7a64d37d2 (diff) | |
| parent | 6bcc7a9bc21056f876803f6910ed600304956774 (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 32ee0ce5afea..ac7313e06e54 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -529,6 +529,7 @@ CONFIG_PINCTRL_SDM845=y CONFIG_PINCTRL_SM8150=y CONFIG_PINCTRL_SM8250=y CONFIG_PINCTRL_LPASS_LPI=y +CONFIG_PINCTRL_SM8350=y CONFIG_GPIO_ALTERA=m CONFIG_GPIO_DAVINCI=y CONFIG_GPIO_DWAPB=y @@ -990,6 +991,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 @@ -1160,6 +1162,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 |