diff options
| author | Linaro CI <ci_notify@linaro.org> | 2021-01-20 12:55:45 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2021-01-20 12:55:45 +0000 |
| commit | 3bfa958d5ca470f8496159949002bd42aec38444 (patch) | |
| tree | ca35eaf15bef7203450b42b468d322d4d95a2949 | |
| parent | 31f6e5d07a158d8b2ca12bf03910b299c751234c (diff) | |
| parent | e4c7acaae106a07ac13d46cab47350a10e1a0e22 (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 5be4ea316400..a8bc66b336a1 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -522,6 +522,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 @@ -971,6 +972,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 |