Merge remote-tracking branches 'spi/topic/mtk', 'spi/topic/pxa2xx', 'spi/topic/qspi...

diff --combined drivers/spi/Kconfig
index b0f30fb68914220ea75b401dd52b7d537c00687e,38ddfba49d76885c60166edae122a7048deb7757,0cae1694014dfbbaba171187fdbd4fc835dc1546,0cae1694014dfbbaba171187fdbd4fc835dc1546,0cae1694014dfbbaba171187fdbd4fc835dc1546,0cae1694014dfbbaba171187fdbd4fc835dc1546..43f6d3dc0fa0bbb253a4ad5c8b028e73d4b02e1b
--- 1/drivers/spi/Kconfig
--- 2/drivers/spi/Kconfig
--- 3/drivers/spi/Kconfig
--- 4/drivers/spi/Kconfig
--- 5/drivers/spi/Kconfig
--- 6/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@@@@@@ -326,6 -326,15 -326,6 -326,6 -326,6 -326,6 +326,15 @@@@@@@ config SPI_MESON_SPIF
          This enables master mode support for the SPIFC (SPI flash
          controller) available in Amlogic Meson SoCs.
      
+ ++++config SPI_MT65XX
+ ++++  tristate "MediaTek SPI controller"
+ ++++  depends on ARCH_MEDIATEK || COMPILE_TEST
+ ++++  help
+ ++++    This selects the MediaTek(R) SPI bus driver.
+ ++++    If you want to use MediaTek(R) SPI interface,
+ ++++    say Y or M here.If you are not sure, say N.
+ ++++    SPI drivers for Mediatek MT65XX and MT81XX series ARM SoCs.
+ ++++
      config SPI_OC_TINY
        tristate "OpenCores tiny SPI"
        depends on GPIOLIB || COMPILE_TEST
@@@@@@@ -612,7 -621,7 -612,7 -612,7 -612,7 -612,7 +621,7 @@@@@@@ config SPI_XTENSA_XTFPG
      
      config SPI_ZYNQMP_GQSPI
        tristate "Xilinx ZynqMP GQSPI controller"
 -----  depends on SPI_MASTER
 +++++  depends on SPI_MASTER && HAS_DMA
        help
          Enables Xilinx GQSPI controller driver for Zynq UltraScale+ MPSoC.