SPI: Add an SPI master driver for the OMAP2 McSPI controller

Add an SPI master driver for the OMAP2 McSPI controller

Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com>

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 5e3f748..46c4744 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -133,6 +133,11 @@ config SPI_OMAP_UWIRE
        help
          This hooks up to the MicroWire controller on OMAP1 chips.
 
+config SPI_OMAP24XX
+       bool "McSPI driver for OMAP24xx"
+       depends on SPI_MASTER && ARCH_OMAP24XX
+       help
+         SPI master controller for OMAP24xx McSPI modules.
 
 config SPI_PXA2XX
        tristate "PXA2xx SSP SPI master"

diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index 5788d86..4e52f93 100644 (file)
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -19,6 +19,7 @@ obj-$(CONFIG_SPI_BUTTERFLY)           += spi_butterfly.o
 obj-$(CONFIG_SPI_IMX)                  += spi_imx.o
 obj-$(CONFIG_SPI_PXA2XX)               += pxa2xx_spi.o
 obj-$(CONFIG_SPI_OMAP_UWIRE)           += omap_uwire.o
+obj-$(CONFIG_SPI_OMAP24XX)             += omap2_mcspi.o
 obj-$(CONFIG_SPI_MPC52xx_PSC)          += mpc52xx_psc_spi.o
 obj-$(CONFIG_SPI_MPC83xx)              += spi_mpc83xx.o
 obj-$(CONFIG_SPI_S3C24XX_GPIO)         += spi_s3c24xx_gpio.o

diff --cc drivers/spi/omap2_mcspi.c
Simple merge