diff options
| author | Linaro CI <ci_notify@linaro.org> | 2021-12-10 14:46:22 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2021-12-10 14:46:22 +0000 |
| commit | 257bc32cb771862e46462f7edb4eedcefe74f01d (patch) | |
| tree | c4c19a60bc9b172f79003e0a13ffe96aa0a9531e | |
| parent | beb420e74d1943825e3c57284999ad72db03080a (diff) | |
| parent | 9dcaa7b117c5288be3254a1ef4e40102fb166b5a (diff) | |
Merge remote-tracking branch 'sm8450-defconfig/tracking-qcomlt-sm8450-defconfig' into integration-linux-qcomltintegration-linux-qcomlt-20211213-142333-v5.16-rc4-278-g257bc32cb77186
# 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 998fa0ac6d1e..4d714403bce5 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -539,6 +539,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 @@ -1044,6 +1045,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 @@ -1238,6 +1240,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 |