Clean up drivers/spi to sync with mainline

Clean up drivers/spi to sync with mainline

Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 5b913c1..7367e5f 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -136,13 +136,6 @@ config SPI_S3C24XX_GPIO
          GPIO lines to provide the SPI bus. This can be used where
          the inbuilt hardware cannot provide the transfer mode, or
          where the board is using non hardware connected pins.
-
-config SPI_OMAP24XX
-       bool "McSPI driver for OMAP24xx"
-       depends on SPI_MASTER && ARCH_OMAP24XX
-       help
-         SPI master controller for OMAP24xx McSPI modules.
-
 #
 # Add new SPI master controllers in alphabetical order above this line
 #
@@ -154,21 +147,6 @@ config SPI_OMAP24XX
 comment "SPI Protocol Masters"
        depends on SPI_MASTER
 
-config TSC2101
-       depends on SPI_MASTER
-       tristate "TSC2101 chip support"
-       ---help---
-         Say Y here if you want support for the TSC2101 chip.
-         At the moment it provides basic register read / write interface
-         as well as a way to enable the MCLK clock.
-
-config TSC2102
-       depends on SPI_MASTER
-       tristate "TSC2102 codec support"
-       ---help---
-         Say Y here if you want support for the TSC2102 chip.  It
-         will be needed for the touchscreen driver on some boards.
-
 config SPI_AT25
        tristate "SPI EEPROMs from most vendors"
        depends on SPI_MASTER && SYSFS
@@ -180,6 +158,21 @@ config SPI_AT25
          This driver can also be built as a module.  If so, the module
          will be called at25.
 
+config SPI_TSC2101
+       depends on SPI_MASTER
+       tristate "TSC2101 chip support"
+       ---help---
+         Say Y here if you want support for the TSC2101 chip.
+        At the moment it provides basic register read / write interface
+        as well as a way to enable the MCLK clock.
+
+config SPI_TSC2102
+       depends on SPI_MASTER
+       tristate "TSC2102 codec support"
+       ---help---
+         Say Y here if you want support for the TSC2102 chip.  It
+        will be needed for the touchscreen driver on some boards.
+
 config SPI_TSC2301
        tristate "TSC2301 driver"
        depends on SPI_MASTER

diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index 5bfdfee..c73c776 100644 (file)
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -21,17 +21,15 @@ obj-$(CONFIG_SPI_OMAP24XX)          += omap2_mcspi.o
 obj-$(CONFIG_SPI_MPC83xx)              += spi_mpc83xx.o
 obj-$(CONFIG_SPI_S3C24XX_GPIO)         += spi_s3c24xx_gpio.o
 obj-$(CONFIG_SPI_S3C24XX)              += spi_s3c24xx.o
-obj-$(CONFIG_SPI_OMAP24XX)             += omap2_mcspi.o
-obj-$(CONFIG_SPI_OMAP_UWIRE)           += omap_uwire.o
 #      ... add above this line ...
 
 # SPI protocol drivers (device/link on bus)
-obj-$(CONFIG_TSC2101)                  += tsc2101.o
-obj-$(CONFIG_TSC2102)                  += tsc2102.o
 obj-$(CONFIG_SPI_AT25)         += at25.o
-obj-$(CONFIG_SPI_TSC2301)              += tsc2301.o
-tsc2301-objs                                   := tsc2301-core.o
-tsc2301-$(CONFIG_SPI_TSC2301_AUDIO)            += tsc2301-mixer.o
+obj-$(CONFIG_SPI_TSC2101)      += tsc2101.o
+obj-$(CONFIG_SPI_TSC2102)      += tsc2102.o
+obj-$(CONFIG_SPI_TSC2301)      += tsc2301.o
+tsc2301-objs                   := tsc2301-core.o
+tsc2301-$(CONFIG_SPI_TSC2301_AUDIO)    += tsc2301-mixer.o
 #      ... add above this line ...
 
 # SPI slave controller drivers (upstream link)

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