powerpc, 8xx: move SPI driver to drivers/spi/

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>

diff --git a/arch/powerpc/cpu/mpc8xx/Makefile b/arch/powerpc/cpu/mpc8xx/Makefile
index f67c3f846386084e074fbf665a62b2b44617aff9..173cf01869c520f048a7098eb1e22743d33d92af 100644 (file)
--- a/arch/powerpc/cpu/mpc8xx/Makefile
+++ b/arch/powerpc/cpu/mpc8xx/Makefile
@@ -15,4 +15,3 @@ obj-y += interrupts.o
 obj-$(CONFIG_CMD_REGINFO) += reginfo.o
 obj-y  += serial.o
 obj-y  += speed.o
-obj-y  += spi.o

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index fe01c737d7111305156895696b99d95c8c208b76..8a8e8e480f548b2277547e6157859793ff313082 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -223,4 +223,10 @@ config TI_QSPI
          Enable the TI Quad-SPI (QSPI) driver for DRA7xx and AM43xx evms.
          This driver support spi flash single, quad and memory reads.
 
+config MPC8XX_SPI
+       bool "MPC8XX SPI Driver"
+       depends on 8xx
+       help
+         Enable support for SPI on MPC8XX
+
 endmenu # menu "SPI Support"

diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index c090562c7732021d20e4e2ccabc71967e2555500..9f8b86de76c4a0ce7d687258c39132372e11b09d 100644 (file)
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -30,6 +30,7 @@ obj-$(CONFIG_FSL_QSPI) += fsl_qspi.o
 obj-$(CONFIG_ICH_SPI) +=  ich.o
 obj-$(CONFIG_KIRKWOOD_SPI) += kirkwood_spi.o
 obj-$(CONFIG_LPC32XX_SSP) += lpc32xx_ssp.o
+obj-$(CONFIG_MPC8XX_SPI) += mpc8xx_spi.o
 obj-$(CONFIG_MPC8XXX_SPI) += mpc8xxx_spi.o
 obj-$(CONFIG_MVEBU_A3700_SPI) += mvebu_a3700_spi.o
 obj-$(CONFIG_MXC_SPI) += mxc_spi.o

diff --git a/arch/powerpc/cpu/mpc8xx/spi.c b/drivers/spi/mpc8xx_spi.c
similarity index 99%
rename from arch/powerpc/cpu/mpc8xx/spi.c
rename to drivers/spi/mpc8xx_spi.c
index 6e3e86fb0fccc34a46a309a76cb8032fa0512ca3..b5bd558526b7c19a0a69416071b6690c0158da12 100644 (file)
--- a/arch/powerpc/cpu/mpc8xx/spi.c
+++ b/drivers/spi/mpc8xx_spi.c
@@ -25,8 +25,6 @@
 #include <post.h>
 #include <serial.h>
 
-#ifdef CONFIG_SPI
-
 #define SPI_EEPROM_WREN                0x06
 #define SPI_EEPROM_RDSR                0x05
 #define SPI_EEPROM_READ                0x03
@@ -336,4 +334,3 @@ ssize_t spi_xfer(size_t count)
 
        return count;
 }
-#endif /* CONFIG_SPI */