Skip to content

Commit 79cd0bb

Browse files
committed
Merge tag 'zynq-soc-for-v5.15' of https://github.com/Xilinx/linux-xlnx into arm/defconfig
ARM: dts: Zynq SoC changes for v5.15 - Enable PL35X nand driver in multi_v7_defconfig * tag 'zynq-soc-for-v5.15' of https://github.com/Xilinx/linux-xlnx: ARM: configs: multi_v7: enable PL35x NAND controller Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 07e7e1c + 75b4c5d commit 79cd0bb

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

arch/arm/configs/multi_v7_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ CONFIG_MTD_NAND_GPMI_NAND=y
216216
CONFIG_MTD_NAND_VF610_NFC=y
217217
CONFIG_MTD_NAND_DAVINCI=y
218218
CONFIG_MTD_NAND_STM32_FMC2=y
219+
CONFIG_MTD_NAND_PL35X=y
219220
CONFIG_MTD_SPI_NOR=y
220221
CONFIG_SPI_ASPEED_SMC=m
221222
CONFIG_MTD_UBI=y

0 commit comments

Comments
 (0)