---

yaml --- r: 291949 b: refs/heads/master c: 1cc2df9 h: refs/heads/master i: 291947: 44cf451 v: v3
git-mirror · Mar 9, 2012 · 6e718a7 · 6e718a7
1 parent e14ebc8
commit 6e718a7
Show file tree

Hide file tree

Showing 4 changed files with 696 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de3bd7e6de25141c466773c2e0fa319b2fa93655
+refs/heads/master: 1cc2df9d6f41b689dc9a562a22de87f860ce6be5
diff --git a/trunk/drivers/spi/Kconfig b/trunk/drivers/spi/Kconfig
@@ -336,6 +336,13 @@ config SPI_SH_HSPI
 	help
 	  SPI driver for SuperH HSPI blocks.
 
+config SPI_SIRF
+	tristate "CSR SiRFprimaII SPI controller"
+	depends on ARCH_PRIMA2
+	select SPI_BITBANG
+	help
+	  SPI driver for CSR SiRFprimaII SoCs
+
 config SPI_STMP3XXX
 	tristate "Freescale STMP37xx/378x SPI/SSP controller"
 	depends on ARCH_STMP3XXX

diff --git a/trunk/drivers/spi/Makefile b/trunk/drivers/spi/Makefile
@@ -53,6 +53,7 @@ obj-$(CONFIG_SPI_SH)			+= spi-sh.o
 obj-$(CONFIG_SPI_SH_HSPI)		+= spi-sh-hspi.o
 obj-$(CONFIG_SPI_SH_MSIOF)		+= spi-sh-msiof.o
 obj-$(CONFIG_SPI_SH_SCI)		+= spi-sh-sci.o
+obj-$(CONFIG_SPI_SIRF)		+= spi-sirf.o
 obj-$(CONFIG_SPI_STMP3XXX)		+= spi-stmp.o
 obj-$(CONFIG_SPI_TEGRA)			+= spi-tegra.o
 obj-$(CONFIG_SPI_TI_SSP)		+= spi-ti-ssp.o