diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2021-08-26 11:32:31 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-08-26 11:32:31 +0200 |
| commit | 79cd0bb66e359f5f9398de9d2e86eac776947691 (patch) | |
| tree | f54898a3dad72b4dfbaaad7d426f1f3c02caf0f4 /arch/arm | |
| parent | 07e7e1c9969ffd033839a1be8ce7048da6819bec (diff) | |
| parent | 75b4c5deef011c7d7b1e23b623455185d60e72a2 (diff) | |
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.eu
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 135a058dff17..ba67c4717dcc 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -216,6 +216,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_PL35X=y CONFIG_MTD_SPI_NOR=y CONFIG_SPI_ASPEED_SMC=m CONFIG_MTD_UBI=y |