diff options
| author | Linaro CI <ci_notify@linaro.org> | 2022-01-28 00:59:02 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2022-01-28 00:59:02 +0000 |
| commit | b942a8e59050c1c351e9067edeb8b78f4290136f (patch) | |
| tree | 655df7ecc4a6c65939b4a86ef13a9b71abcfa0fa | |
| parent | 4a16ace7034c5150689381fedb6f24b5b899d999 (diff) | |
| parent | 3a8bb6da5559c56a622d4dcc02ff6af0df7e7fa9 (diff) | |
Merge remote-tracking branch 'sm8450-defconfig/tracking-qcomlt-sm8450-defconfig' into integration-linux-qcomltintegration-linux-qcomlt-20220128-131355-v5.17-rc1-257-gb942a8e59050
# 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 14b47f271309..f637c8af109b 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -543,6 +543,7 @@ CONFIG_PINCTRL_SDM845=y CONFIG_PINCTRL_SM8150=y CONFIG_PINCTRL_SM8250=y CONFIG_PINCTRL_SM8350=y +CONFIG_PINCTRL_SM8450=y CONFIG_PINCTRL_LPASS_LPI=y CONFIG_GPIO_ALTERA=m CONFIG_GPIO_DAVINCI=y @@ -1054,6 +1055,7 @@ CONFIG_SDM_DISPCC_845=y CONFIG_SM_GCC_8150=y CONFIG_SM_GCC_8250=y CONFIG_SM_GCC_8350=y +CONFIG_SM_GCC_8450=y CONFIG_SM_GPUCC_8150=y CONFIG_SM_GPUCC_8250=y CONFIG_SM_DISPCC_8250=y @@ -1251,6 +1253,7 @@ CONFIG_INTERCONNECT_QCOM_SDM845=m CONFIG_INTERCONNECT_QCOM_SM8150=m CONFIG_INTERCONNECT_QCOM_SM8250=m CONFIG_INTERCONNECT_QCOM_SM8350=m +CONFIG_INTERCONNECT_QCOM_SM8450=m CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y CONFIG_EXT4_FS_POSIX_ACL=y |