---

yaml --- r: 47926 b: refs/heads/master c: fdb3c18 h: refs/heads/master v: v3
git-mirror · Feb 12, 2007 · dd6e164 · dd6e164
1 parent 69ca1ee
commit dd6e164
Show file tree

Hide file tree

Showing 4 changed files with 581 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85abfaa78239e63f553cc446f8ae5b955282aa29
+refs/heads/master: fdb3c18d639311287dc4675abe743847a1aa62a8
diff --git a/trunk/drivers/spi/Kconfig b/trunk/drivers/spi/Kconfig
@@ -87,6 +87,13 @@ config SPI_MPC83xx
 	  family of PowerPC processors.  The MPC83xx uses a simple set of shift
 	  registers for data (opposed to the CPM based descriptor model).
 
+config SPI_OMAP_UWIRE
+	tristate "OMAP1 MicroWire"
+	depends on SPI_MASTER && ARCH_OMAP1
+	select SPI_BITBANG
+	help
+	  This hooks up to the MicroWire controller on OMAP1 chips.
+
 config SPI_PXA2XX
 	tristate "PXA2xx SSP SPI master"
 	depends on SPI_MASTER && ARCH_PXA && EXPERIMENTAL

diff --git a/trunk/drivers/spi/Makefile b/trunk/drivers/spi/Makefile
@@ -14,6 +14,7 @@ obj-$(CONFIG_SPI_MASTER)		+= spi.o
 obj-$(CONFIG_SPI_BITBANG)		+= spi_bitbang.o
 obj-$(CONFIG_SPI_BUTTERFLY)		+= spi_butterfly.o
 obj-$(CONFIG_SPI_PXA2XX)		+= pxa2xx_spi.o
+obj-$(CONFIG_SPI_OMAP_UWIRE)		+= omap_uwire.o
 obj-$(CONFIG_SPI_MPC83xx)		+= spi_mpc83xx.o
 obj-$(CONFIG_SPI_S3C24XX_GPIO)		+= spi_s3c24xx_gpio.o
 obj-$(CONFIG_SPI_S3C24XX)		+= spi_s3c24xx.o