diff options
| author | Linaro CI <ci_notify@linaro.org> | 2020-11-12 13:30:32 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2020-11-12 13:30:32 +0000 |
| commit | 4874b6f1f1291881c442ad0dbf665cb07cd57a69 (patch) | |
| tree | b81bac68ef518e52cf8769266e5256efbc5836f4 | |
| parent | 203c291bd7ebb424ff1bb9af6154bcdd234f6f14 (diff) | |
| parent | d3f652340a47d6fdf360f291a874a6bda97db8e8 (diff) | |
Merge remote-tracking branch 'sdx55-defconfig/tracking-qcomlt-sdx55-defconfig' into integration-linux-qcomltintegration-linux-qcomlt-20201113-152223-v5.10-rc3-277-g4874b6f1f129
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index a611b0c1e540..57ad9508ce89 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 @@ -447,6 +448,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 +965,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 +985,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 |