diff options
| author | Linaro CI <ci_notify@linaro.org> | 2019-07-08 09:18:09 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2019-07-08 09:18:09 +0000 |
| commit | 3c56f48eafcf6b11703d99d8464c395d278b14a1 (patch) | |
| tree | 0c69f0a0a137d1b732490dc4fb53aa807f717d71 | |
| parent | b6254118a77e949d28602100b15c62ecde8802a4 (diff) | |
| parent | ade172e40032134eadef66d767b0020f67ecfc57 (diff) | |
Merge remote-tracking branch 'sm8150-defconf/tracking-qcomlt-sm8150-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 254fd5df776c..bf73ab525c2a 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -398,6 +398,7 @@ CONFIG_PINCTRL_SDM845=y CONFIG_PINCTRL_QDF2XXX=y CONFIG_PINCTRL_QCOM_SPMI_PMIC=y CONFIG_PINCTRL_SDM845=y +CONFIG_PINCTRL_SM8150=y CONFIG_GPIO_DWAPB=y CONFIG_GPIO_MB86S7X=y CONFIG_GPIO_PL061=y @@ -690,6 +691,7 @@ CONFIG_MSM_MMCC_8996=y CONFIG_MSM_GCC_8998=y CONFIG_QCS_GCC_404=y CONFIG_SDM_GCC_845=y +CONFIG_SM_GCC_8150=y CONFIG_QCOM_HFPLL=y CONFIG_HWSPINLOCK=y CONFIG_SDM_GPUCC_845=y |