Commit 79cd0bb6 authored by Arnd Bergmann's avatar Arnd Bergmann

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/5a25f882-103f-4df0-0d90-868d264c900b@monstr.euSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 07e7e1c9 75b4c5de
...@@ -216,6 +216,7 @@ CONFIG_MTD_NAND_GPMI_NAND=y ...@@ -216,6 +216,7 @@ CONFIG_MTD_NAND_GPMI_NAND=y
CONFIG_MTD_NAND_VF610_NFC=y CONFIG_MTD_NAND_VF610_NFC=y
CONFIG_MTD_NAND_DAVINCI=y CONFIG_MTD_NAND_DAVINCI=y
CONFIG_MTD_NAND_STM32_FMC2=y CONFIG_MTD_NAND_STM32_FMC2=y
CONFIG_MTD_NAND_PL35X=y
CONFIG_MTD_SPI_NOR=y CONFIG_MTD_SPI_NOR=y
CONFIG_SPI_ASPEED_SMC=m CONFIG_SPI_ASPEED_SMC=m
CONFIG_MTD_UBI=y CONFIG_MTD_UBI=y
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment