Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 74ff666b authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'spi/topic/mem' and 'spi/topic/mtd' into spi-next

parents b3fc4e0e aa167f3f 2a9d92fb

drivers/mtd/spi-nor/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -39,15 +39,6 @@ config SPI_ASPEED_SMC 
	  and support for the SPI flash memory controller (SPI) for

	  the host firmware. The implementation only supports SPI NOR.



config SPI_ATMEL_QUADSPI

	tristate "Atmel Quad SPI Controller"

	depends on ARCH_AT91 || (ARM && COMPILE_TEST)

	depends on OF && HAS_IOMEM

	help

	  This enables support for the Quad SPI controller in master mode.

	  This driver does not support generic SPI. The implementation only

	  supports SPI NOR.



config SPI_CADENCE_QUADSPI

	tristate "Cadence Quad SPI controller"

	depends on OF && (ARM || ARM64 || COMPILE_TEST)

drivers/mtd/spi-nor/Makefile

+0 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-$(CONFIG_MTD_SPI_NOR)	+= spi-nor.o

obj-$(CONFIG_SPI_ASPEED_SMC)	+= aspeed-smc.o

obj-$(CONFIG_SPI_ATMEL_QUADSPI)	+= atmel-quadspi.o

obj-$(CONFIG_SPI_CADENCE_QUADSPI)	+= cadence-quadspi.o

obj-$(CONFIG_SPI_FSL_QUADSPI)	+= fsl-quadspi.o

obj-$(CONFIG_SPI_HISI_SFC)	+= hisi-sfc.o

drivers/spi/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -91,6 +91,15 @@ config SPI_AT91_USART 
	  This selects a driver for the AT91 USART Controller as SPI Master,

	  present on AT91 and SAMA5 SoC series.



config SPI_ATMEL_QUADSPI

	tristate "Atmel Quad SPI Controller"

	depends on ARCH_AT91 || (ARM && COMPILE_TEST && !ARCH_EBSA110)

	depends on OF && HAS_IOMEM

	help

	  This enables support for the Quad SPI controller in master mode.

	  This driver does not support generic SPI. The implementation only

	  supports spi-mem interface.



config SPI_AU1550

	tristate "Au1550/Au1200/Au1300 SPI Controller"

	depends on MIPS_ALCHEMY

drivers/spi/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ obj-$(CONFIG_SPI_LOOPBACK_TEST) += spi-loopback-test.o 
obj-$(CONFIG_SPI_ALTERA)		+= spi-altera.o

obj-$(CONFIG_SPI_ARMADA_3700)		+= spi-armada-3700.o

obj-$(CONFIG_SPI_ATMEL)			+= spi-atmel.o

obj-$(CONFIG_SPI_ATMEL_QUADSPI)		+= atmel-quadspi.o

obj-$(CONFIG_SPI_AT91_USART)		+= spi-at91-usart.o

obj-$(CONFIG_SPI_ATH79)			+= spi-ath79.o

obj-$(CONFIG_SPI_AU1550)		+= spi-au1550.o