Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-spi into...

- spi_nor_read_sfdp_dma_unsafe (Vaishnav)
- w25q01/02 (Jim)

diff --cc drivers/mtd/spi/Kconfig
Simple merge

diff --cc drivers/mtd/spi/spi-nor-ids.c
Simple merge

diff --cc drivers/spi/cadence_qspi.c
Simple merge

diff --cc include/linux/mtd/spinand.h
Simple merge