diff options
author | Linaro CI <ci_notify@linaro.org> | 2020-10-30 15:27:48 +0000 |
---|---|---|
committer | Linaro CI <ci_notify@linaro.org> | 2020-10-30 15:27:48 +0000 |
commit | 476545eaed4cc0a297be81178cd9fc9eb3c1f544 (patch) | |
tree | a8119024ed26f58d92ad7391ed77846f693390f8 | |
parent | 5ec50b13b2d5635ba9a0d7ff44e1d9d7593e331b (diff) | |
parent | 63815764caad334b7305e9445f8c56c25297f84a (diff) |
Merge remote-tracking branch 'sdx55-defconfig/tracking-qcomlt-sdx55-defconfig' into integration-linux-qcomltintegration-linux-qcomlt-20201102-061500-v5.10-rc1-265-g476545eaed4cc
-rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index e731cdf7c88c..91a2de5e7dd7 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,8 +963,10 @@ 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_SDX_GCC_55=y CONFIG_MSM_MMCC_8960=y CONFIG_MSM_MMCC_8974=y CONFIG_BCM2835_MBOX=y @@ -980,6 +983,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 |