summaryrefslogtreecommitdiff
path: root/arch/arm64/configs
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2021-02-02 22:41:14 +0100
committerArnd Bergmann <arnd@arndb.de>2021-02-02 22:41:14 +0100
commit77bad664169a7b5ea954638cf049d063b8b055cd (patch)
treeaf0d338ad65cb2091fcbe48e72417c07e20c0cac /arch/arm64/configs
parentc0ec73899d43dfe2600b9b2a5c130401a907c98a (diff)
parente25efbd140c296b52aaa5f0380628e55578c5eed (diff)
Merge tag 'v5.11-next-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into arm/defconfig
- build PMIC wrapper as a module - build DEVAPC as a module * tag 'v5.11-next-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux: arm64: configs: Support DEVAPC on MediaTek platforms arm64: configs: Support pwrap on Mediatek MT6779 platform Link: https://lore.kernel.org/r/aa5c6673-f018-00d3-42da-46a4976d8ef7@gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm64/configs')
-rw-r--r--arch/arm64/configs/defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 9d643aa956b4..3f6a2f50b7cf 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -263,6 +263,7 @@ CONFIG_MTD_NAND_MARVELL=y
CONFIG_MTD_NAND_FSL_IFC=y
CONFIG_MTD_NAND_QCOM=y
CONFIG_MTD_SPI_NOR=y
+CONFIG_MTK_DEVAPC=m
CONFIG_SPI_CADENCE_QUADSPI=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_NBD=m
@@ -479,6 +480,7 @@ CONFIG_SPI_S3C64XX=y
CONFIG_SPI_SH_MSIOF=m
CONFIG_SPI_SUN6I=y
CONFIG_SPI_SPIDEV=m
+CONFIG_MTK_PMIC_WRAP=m
CONFIG_SPMI=y
CONFIG_PINCTRL_SINGLE=y
CONFIG_PINCTRL_MAX77620=y