diff options
| author | Linaro CI <ci_notify@linaro.org> | 2019-08-19 10:20:09 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2019-08-19 10:20:09 +0000 |
| commit | 304daa55b6949a5c85701846185c95f70c28d05f (patch) | |
| tree | cf84446f26787a56258d7d681422d99209b874a1 | |
| parent | fc36d6aa4ee64fab437de56dcd465d3cd8b3f986 (diff) | |
| parent | bbf4f4a95ffc60bff306fef7618dde40de375a4b (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 f2c7d99e2a72..708dbbb1631c 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -419,6 +419,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 @@ -720,6 +721,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 |