3 files changed, 6 insertions, 5 deletions

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index d966de1afc52..e8f02a6f2d23 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -182,12 +182,13 @@ config SPI_MPC512x_PSC
           This enables using the Freescale MPC5121 Programmable Serial
           Controller in SPI master mode.
 
-config SPI_MPC8xxx
-        tristate "Freescale MPC8xxx SPI controller"
+config SPI_FSL_SPI
+        tristate "Freescale SPI controller"
         depends on FSL_SOC
         help
-          This enables using the Freescale MPC8xxx SPI controllers in master
-          mode.
+          This enables using the Freescale SPI controllers in master mode.
+          MPC83xx platform uses the controller in cpu mode or CPM/QE mode.
+          MPC8569 uses the controller in QE mode, MPC8610 in cpu mode.
 
 config SPI_OMAP_UWIRE
         tristate "OMAP1 MicroWire"
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index f32d11e1ffec..c6a56c798823 100644
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -32,7 +32,7 @@ obj-$(CONFIG_SPI_PL022)			+= amba-pl022.o
 obj-$(CONFIG_SPI_MPC512x_PSC)           += mpc512x_psc_spi.o
 obj-$(CONFIG_SPI_MPC52xx_PSC)           += mpc52xx_psc_spi.o
 obj-$(CONFIG_SPI_MPC52xx)               += mpc52xx_spi.o
-obj-$(CONFIG_SPI_MPC8xxx)               += spi_mpc8xxx.o
+obj-$(CONFIG_SPI_FSL_SPI)               += spi_fsl_spi.o
 obj-$(CONFIG_SPI_PPC4xx)                += spi_ppc4xx.o
 obj-$(CONFIG_SPI_S3C24XX_GPIO)          += spi_s3c24xx_gpio.o
 obj-$(CONFIG_SPI_S3C24XX)               += spi_s3c24xx_hw.o
diff --git a/drivers/spi/spi_mpc8xxx.c b/drivers/spi/spi_fsl_spi.c
index 1dd86b835cd8..1dd86b835cd8 100644
--- a/drivers/spi/spi_mpc8xxx.c
+++ b/drivers/spi/spi_fsl_spi.c