diff options
| author | Linaro CI <ci_notify@linaro.org> | 2019-06-30 03:44:14 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2019-06-30 03:44:14 +0000 |
| commit | 489894fea0a6b4f1b5d9b6915faf40c669a30c5a (patch) | |
| tree | ad6e6ae971bb796dcfd8baf5fe00395e31f5d8db | |
| parent | 462f33a2a0c3976051fbda540d76c1f924178503 (diff) | |
| parent | ade172e40032134eadef66d767b0020f67ecfc57 (diff) | |
Merge remote-tracking branch 'sm8150-defconf/tracking-qcomlt-sm8150-defconfig' into integration-linux-qcomltintegration-linux-qcomlt-20190703-045043-v5.2-rc7-134-g489894fea0a6b
# 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 e649f1674a39..892e294886c3 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 |