OSDN Git Service

Merge tag 'zynq-soc-for-v5.15' of https://github.com/Xilinx/linux-xlnx into arm/defconfig
authorArnd Bergmann <arnd@arndb.de>
Thu, 26 Aug 2021 09:32:31 +0000 (11:32 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 26 Aug 2021 09:32:31 +0000 (11:32 +0200)
commit79cd0bb66e359f5f9398de9d2e86eac776947691
treef54898a3dad72b4dfbaaad7d426f1f3c02caf0f4
parent07e7e1c9969ffd033839a1be8ce7048da6819bec
parent75b4c5deef011c7d7b1e23b623455185d60e72a2
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>
arch/arm/configs/multi_v7_defconfig