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

Commit f1632c32 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'spi/topic/blackfin-v3' into spi-next

parents b29bc3df d9740f6a

drivers/spi/Kconfig

+8 −1
Original line number Diff line number Diff line
@@ -88,10 +88,17 @@ config SPI_BCM2835 


config SPI_BFIN5XX

	tristate "SPI controller driver for ADI Blackfin5xx"

	depends on BLACKFIN

	depends on BLACKFIN && !BF60x

	help

	  This is the SPI controller master driver for Blackfin 5xx processor.



config SPI_BFIN_V3

	tristate "SPI controller v3 for Blackfin"

	depends on BF60x

	help

	  This is the SPI controller v3 master driver

	  found on Blackfin 60x processor.



config SPI_BFIN_SPORT

	tristate "SPI bus via Blackfin SPORT"

	depends on BLACKFIN

drivers/spi/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ obj-$(CONFIG_SPI_AU1550) += spi-au1550.o 
obj-$(CONFIG_SPI_BCM2835)		+= spi-bcm2835.o

obj-$(CONFIG_SPI_BCM63XX)		+= spi-bcm63xx.o

obj-$(CONFIG_SPI_BFIN5XX)		+= spi-bfin5xx.o

obj-$(CONFIG_SPI_BFIN_V3)               += spi-bfin-v3.o

obj-$(CONFIG_SPI_BFIN_SPORT)		+= spi-bfin-sport.o

obj-$(CONFIG_SPI_BITBANG)		+= spi-bitbang.o

obj-$(CONFIG_SPI_BUTTERFLY)		+= spi-butterfly.o