diff options
| author | Linaro CI <ci_notify@linaro.org> | 2020-12-29 02:05:22 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2020-12-29 02:05:22 +0000 |
| commit | bd646ef73145ce96eab6882b7da45310eb4304b6 (patch) | |
| tree | f647f37f4e1c298aa6b401abf0d04286e25cf30a | |
| parent | 5989af4c2376d5464c5f98dac26f07ab5fb8d0f9 (diff) | |
| parent | 0e4d043908f01a271a8eb3bf278c2a2d1dfcc0d9 (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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 681cad0f2c8c..e6ebabab77b8 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -520,6 +520,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 @@ -968,6 +969,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 |