diff options
| author | Linaro CI <ci_notify@linaro.org> | 2020-10-29 10:06:38 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2020-10-29 10:06:38 +0000 |
| commit | 835f1b3da64b6ec182b786914dc595253fd260c7 (patch) | |
| tree | 3c2351acd6bf6613478b1ccf5939e8a2c27e0a97 | |
| parent | 28c4478dc3a12611e3c04678e2948632f75102e7 (diff) | |
| parent | 9f44616cc3a3c56f0e981109877ee655662dc1d7 (diff) | |
Merge remote-tracking branch 'sdx55-defconfig/tracking-qcomlt-sdx55-defconfig' into integration-linux-qcomltintegration-linux-qcomlt-20201030-012038-v5.10-rc1-267-g835f1b3da64b6
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index e731cdf7c88c..6a55c081bc66 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -447,6 +447,7 @@ CONFIG_PINCTRL_MSM8660=y CONFIG_PINCTRL_MSM8960=y CONFIG_PINCTRL_MSM8X74=y CONFIG_PINCTRL_MSM8916=y +CONFIG_PINCTRL_SDX55=y CONFIG_PINCTRL_QCOM_SPMI_PMIC=y CONFIG_PINCTRL_QCOM_SSBI_PMIC=y CONFIG_GPIO_ASPEED_SGPIO=y @@ -962,6 +963,7 @@ CONFIG_COMMON_CLK_S2MPS11=m CONFIG_CLK_RASPBERRYPI=y CONFIG_COMMON_CLK_QCOM=y CONFIG_QCOM_CLK_RPM=y +CONFIG_QCOM_CLK_RPMH=y CONFIG_APQ_MMCC_8084=y CONFIG_MSM_GCC_8660=y CONFIG_MSM_MMCC_8960=y @@ -980,6 +982,7 @@ CONFIG_ASPEED_P2A_CTRL=m CONFIG_RASPBERRYPI_POWER=y CONFIG_QCOM_GSBI=y CONFIG_QCOM_PM=y +CONFIG_QCOM_RPMH=y CONFIG_QCOM_SMD_RPM=m CONFIG_QCOM_WCNSS_CTRL=m CONFIG_ARCH_EMEV2=y |