From: Mark Brown Date: Mon, 23 May 2016 11:16:51 +0000 (+0100) Subject: Merge remote-tracking branches 'spi/topic/octeon', 'spi/topic/omap2-mcspi', 'spi... X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=b340941af9d85ca74d3efacb7210e95296c484aa;p=deliverable%2Flinux.git Merge remote-tracking branches 'spi/topic/octeon', 'spi/topic/omap2-mcspi', 'spi/topic/orion', 'spi/topic/pic32' and 'spi/topic/pic32-qspi' into spi-next --- b340941af9d85ca74d3efacb7210e95296c484aa diff --cc drivers/spi/Kconfig index 28147c8031c6,9d8c84bb1544,9d8c84bb1544,720c5ee515c7,8a8ff5051c64,0f507552ed3e..b189508ccf92 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@@@@@@ -435,6 -436,6 -436,6 -436,6 -436,12 -436,19 +435,19 @@@@@@@ config SPI_ORIO help This enables using the SPI master controller on the Orion chips. ++++ config SPI_PIC32 ++++ tristate "Microchip PIC32 series SPI" ++++ depends on MACH_PIC32 || COMPILE_TEST ++++ help ++++ SPI driver for Microchip PIC32 SPI master controller. ++++ +++++ config SPI_PIC32_SQI +++++ tristate "Microchip PIC32 Quad SPI driver" +++++ depends on MACH_PIC32 || COMPILE_TEST +++++ depends on HAS_DMA +++++ help +++++ SPI driver for PIC32 Quad SPI controller. +++++ config SPI_PL022 tristate "ARM AMBA PL022 SSP controller" depends on ARM_AMBA