diff options
| author | Linaro CI <ci_notify@linaro.org> | 2020-11-23 00:11:27 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2020-11-23 00:11:27 +0000 |
| commit | b2f71a9ef592864c8d199e5d6d274a3b3f6c2a35 (patch) | |
| tree | b98c53d5c5a250a2b2659e6c1b5fc201c4443103 | |
| parent | afcf5e1cf37c2033e5e8de030eddcc65c24dd378 (diff) | |
| parent | c497d10d841ee60f031fa372b57f4d0f94afe1f2 (diff) | |
Merge remote-tracking branch 'sdx55-defconfig/tracking-qcomlt-sdx55-defconfig' into integration-linux-qcomltintegration-linux-qcomlt-20201124-101703-v5.10-rc5-290-gb2f71a9ef5928
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index a611b0c1e540..54fc5bd19534 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -211,6 +211,7 @@ CONFIG_MTD_NAND_GPMI_NAND=y CONFIG_MTD_NAND_VF610_NFC=y CONFIG_MTD_NAND_DAVINCI=y CONFIG_MTD_NAND_STM32_FMC2=y +CONFIG_MTD_NAND_QCOM=y CONFIG_MTD_SPI_NOR=y CONFIG_SPI_ASPEED_SMC=m CONFIG_MTD_UBI=y @@ -440,6 +441,7 @@ CONFIG_PINCTRL_AS3722=y CONFIG_PINCTRL_RZA2=y CONFIG_PINCTRL_STMFX=y CONFIG_PINCTRL_PALMAS=y +CONFIG_PINCTRL_MSM=y CONFIG_PINCTRL_APQ8064=y CONFIG_PINCTRL_APQ8084=y CONFIG_PINCTRL_IPQ8064=y @@ -447,6 +449,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 +966,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,7 +986,9 @@ 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_SMEM=y CONFIG_QCOM_WCNSS_CTRL=m CONFIG_ARCH_EMEV2=y CONFIG_ARCH_R7S72100=y |