---

yaml --- r: 180878 b: refs/heads/master c: 34b8c66 h: refs/heads/master v: v3
git-mirror · Jan 20, 2010 · f1fb219 · f1fb219
1 parent dd9163c
commit f1fb219
Show file tree

Hide file tree

Showing 4 changed files with 652 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 631e61b7ca12ef14c834f99f8948e410c539f585
+refs/heads/master: 34b8c66173666025020e3a6f8d4a5c238b19cde5
diff --git a/trunk/drivers/spi/Kconfig b/trunk/drivers/spi/Kconfig
@@ -100,6 +100,16 @@ config SPI_BUTTERFLY
 	  inexpensive battery powered microcontroller evaluation board.
 	  This same cable can be used to flash new firmware.
 
+config SPI_COLDFIRE_QSPI
+	tristate "Freescale Coldfire QSPI controller"
+	depends on (M520x || M523x || M5249 || M527x || M528x || M532x)
+	help
+	  This enables support for the Coldfire QSPI controller in master
+	  mode.
+
+	  This driver can also be built as a module.  If so, the module
+	  will be called coldfire_qspi.
+
 config SPI_DAVINCI
 	tristate "SPI controller driver for DaVinci/DA8xx SoC's"
 	depends on SPI_MASTER && ARCH_DAVINCI

diff --git a/trunk/drivers/spi/Makefile b/trunk/drivers/spi/Makefile
@@ -16,6 +16,7 @@ obj-$(CONFIG_SPI_BFIN)			+= spi_bfin5xx.o
 obj-$(CONFIG_SPI_BITBANG)		+= spi_bitbang.o
 obj-$(CONFIG_SPI_AU1550)		+= au1550_spi.o
 obj-$(CONFIG_SPI_BUTTERFLY)		+= spi_butterfly.o
+obj-$(CONFIG_SPI_COLDFIRE_QSPI)		+= coldfire_qspi.o
 obj-$(CONFIG_SPI_DAVINCI)		+= davinci_spi.o
 obj-$(CONFIG_SPI_DESIGNWARE)		+= dw_spi.o
 obj-$(CONFIG_SPI_DW_PCI)		+= dw_spi_pci.o