Merge remote-tracking branches 'spi/topic/loopback', 'spi/topic/meson-spicc', 'spi...

diff --combined drivers/spi/Kconfig
index 82cd818aa06293f5903b92cf222471e7a8cad939,1761c9004fc1149e8552b86525613e93c2b49cf4,1dcb14ce6f386d334eef2641b23be0568cc5ec4a,1761c9004fc1149e8552b86525613e93c2b49cf4,1761c9004fc1149e8552b86525613e93c2b49cf4..fd1b4fdb72a4fefa079a08ddc50d4d8a7721b4fd
--- 1/drivers/spi/Kconfig
--- 2/drivers/spi/Kconfig
--- 3/drivers/spi/Kconfig
--- 4/drivers/spi/Kconfig
--- 5/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@@@@@ -393,6 -393,6 -393,13 -393,6 -393,6 +393,13 @@@@@@ config SPI_FSL_ESP
          From MPC8536, 85xx platform uses the controller, and all P10xx,
          P20xx, P30xx,P40xx, P50xx uses this controller.
     
++ ++config SPI_MESON_SPICC
++ ++   tristate "Amlogic Meson SPICC controller"
++ ++   depends on ARCH_MESON || COMPILE_TEST
++ ++   help
++ ++     This enables master mode support for the SPICC (SPI communication
++ ++     controller) available in Amlogic Meson SoCs.
++ ++
     config SPI_MESON_SPIFC
        tristate "Amlogic Meson SPIFC controller"
        depends on ARCH_MESON || COMPILE_TEST
@@@@@@ -457,7 -457,6 -464,6 -457,6 -457,6 +464,7 @@@@@@ config SPI_OMAP24X
     
     config SPI_TI_QSPI
        tristate "DRA7xxx QSPI controller support"
 ++++   depends on HAS_DMA
        depends on ARCH_OMAP2PLUS || COMPILE_TEST
        help
          QSPI master controller for DRA7xxx used for flash devices.
@@@@@@ -785,30 -784,6 -791,6 -784,6 -784,6 +792,30 @@@@@@ config SPI_TLE62X
     
     endif # SPI_MASTER
     
 ----# (slave support would go here)
 ++++#
 ++++# SLAVE side ... listening to other SPI masters
 ++++#
 ++++
 ++++config SPI_SLAVE
 ++++   bool "SPI slave protocol handlers"
 ++++   help
 ++++     If your system has a slave-capable SPI controller, you can enable
 ++++     slave protocol handlers.
 ++++
 ++++if SPI_SLAVE
 ++++
 ++++config SPI_SLAVE_TIME
 ++++   tristate "SPI slave handler reporting boot up time"
 ++++   help
 ++++     SPI slave handler responding with the time of reception of the last
 ++++     SPI message.
 ++++
 ++++config SPI_SLAVE_SYSTEM_CONTROL
 ++++   tristate "SPI slave handler controlling system state"
 ++++   help
 ++++     SPI slave handler to allow remote control of system reboot, power
 ++++     off, halt, and suspend.
 ++++
 ++++endif # SPI_SLAVE
     
     endif # SPI

diff --combined drivers/spi/Makefile
index 1d7923e8c63bc22b10cdca1a6104ea83a2e7c41c,b375a7a892160b76b5bf62a7f66f86484f300ed1,0d8c95e66a9b1243de720c5a08ce5385db35bf93,b375a7a892160b76b5bf62a7f66f86484f300ed1,b375a7a892160b76b5bf62a7f66f86484f300ed1..31dccfbb335e30ca847ea06b7c1cd92070138f5d
--- 1/drivers/spi/Makefile
--- 2/drivers/spi/Makefile
--- 3/drivers/spi/Makefile
--- 4/drivers/spi/Makefile
--- 5/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@@@@@ -53,6 -53,6 -53,7 -53,6 -53,6 +53,7 @@@@@@ obj-$(CONFIG_SPI_LANTIQ_SSC)          += spi-la
     obj-$(CONFIG_SPI_JCORE)                    += spi-jcore.o
     obj-$(CONFIG_SPI_LM70_LLP)         += spi-lm70llp.o
     obj-$(CONFIG_SPI_LP8841_RTC)               += spi-lp8841-rtc.o
++ ++obj-$(CONFIG_SPI_MESON_SPICC)              += spi-meson-spicc.o
     obj-$(CONFIG_SPI_MESON_SPIFC)              += spi-meson-spifc.o
     obj-$(CONFIG_SPI_MPC512x_PSC)              += spi-mpc512x-psc.o
     obj-$(CONFIG_SPI_MPC52xx_PSC)              += spi-mpc52xx-psc.o
@@@@@@ -105,7 -105,3 -106,3 -105,3 -105,3 +106,7 @@@@@@ obj-$(CONFIG_SPI_XILINX)                += spi-xilinx
     obj-$(CONFIG_SPI_XLP)                      += spi-xlp.o
     obj-$(CONFIG_SPI_XTENSA_XTFPGA)            += spi-xtensa-xtfpga.o
     obj-$(CONFIG_SPI_ZYNQMP_GQSPI)             += spi-zynqmp-gqspi.o
 ++++
 ++++# SPI slave protocol handlers
 ++++obj-$(CONFIG_SPI_SLAVE_TIME)               += spi-slave-time.o
 ++++obj-$(CONFIG_SPI_SLAVE_SYSTEM_CONTROL)     += spi-slave-system-control.o