aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinaro CI <ci_notify@linaro.org>2020-11-05 19:29:12 +0000
committerLinaro CI <ci_notify@linaro.org>2020-11-05 19:29:12 +0000
commit8360acfc58da900230ee266742484a844d243a20 (patch)
tree95860a6b5fd910ffdde5c292df61ee3447b4d55d
parent4947d490768e9e031c1e3c7f74bda5c4f1f992e0 (diff)
parent63815764caad334b7305e9445f8c56c25297f84a (diff)
Merge remote-tracking branch 'sdx55-defconfig/tracking-qcomlt-sdx55-defconfig' into integration-linux-qcomltintegration-linux-qcomlt-20201109-003837-v5.10-rc2-261-g8360acfc58da9
-rw-r--r--arch/arm/configs/multi_v7_defconfig4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index a611b0c1e540..8ec27d356e37 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
@@ -963,8 +964,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
@@ -981,6 +984,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