at91: move dataflash spi driver to drivers/spi

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

diff --git a/cpu/arm926ejs/at91/Makefile b/cpu/arm926ejs/at91/Makefile
index d0d47e67485cefc6cfd961e9772b45cbaf0c35b9..34e746182a654686762a46929dc436c91067eea3 100644 (file)
--- a/cpu/arm926ejs/at91/Makefile
+++ b/cpu/arm926ejs/at91/Makefile
@@ -55,7 +55,6 @@ COBJS-y                               += at91sam9rl_serial.o
 COBJS-$(CONFIG_HAS_DATAFLASH)  += at91sam9rl_spi.o
 endif
 COBJS-$(CONFIG_AT91_LED)       += led.o
-COBJS-$(CONFIG_HAS_DATAFLASH)  += spi.o
 COBJS-y        += timer.o
 SOBJS  = lowlevel_init.o
 

diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index 6e2c121d67b2f3e422e82aa1e235b6fe2d8c1d70..1350f3e0bff660a7b88e81497e38545ce621b23d 100644 (file)
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -25,6 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB    := $(obj)libspi.a
 
+COBJS-$(CONFIG_ATMEL_DATAFLASH_SPI) += atmel_dataflash_spi.o
 COBJS-$(CONFIG_ATMEL_SPI) += atmel_spi.o
 COBJS-$(CONFIG_BFIN_SPI) += bfin_spi.o
 COBJS-$(CONFIG_MPC8XXX_SPI) += mpc8xxx_spi.o

diff --git a/cpu/arm926ejs/at91/spi.c b/drivers/spi/atmel_dataflash_spi.c
similarity index 100%
rename from cpu/arm926ejs/at91/spi.c
rename to drivers/spi/atmel_dataflash_spi.c

diff --git a/include/configs/afeb9260.h b/include/configs/afeb9260.h
index 72881abc441f1e74f4e9cff1cd277dbfb7c98490..de938f7a29169a2fcb1fa21d0a4669fa08f6bb23 100644 (file)
--- a/include/configs/afeb9260.h
+++ b/include/configs/afeb9260.h
@@ -87,6 +87,7 @@
 #define PHYS_SDRAM_SIZE                        0x04000000      /* 64 megs */
 
 /* DataFlash */
+#define CONFIG_ATMEL_DATAFLASH_SPI
 #define CONFIG_HAS_DATAFLASH           1
 #define CONFIG_SYS_SPI_WRITE_TOUT              (5 * CONFIG_SYS_HZ)
 #define CONFIG_SYS_MAX_DATAFLASH_BANKS         2

diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h
index 2f4baed44b2965a2f2dc55be996a2639ee78d26b..b978731bcecc05714973489b6124f387acf63454 100644 (file)
--- a/include/configs/at91cap9adk.h
+++ b/include/configs/at91cap9adk.h
@@ -107,6 +107,7 @@
 #define PHYS_SDRAM_SIZE                        0x04000000      /* 64 megs */
 
 /* DataFlash */
+#define CONFIG_ATMEL_DATAFLASH_SPI
 #define CONFIG_HAS_DATAFLASH           1
 #define CONFIG_SYS_SPI_WRITE_TOUT              (5*CONFIG_SYS_HZ)
 #define CONFIG_SYS_MAX_DATAFLASH_BANKS         1

diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index 29cabcfd3e8653c0d8b3dc01a0631ffbbc2589d7..bcc65bdd64a0bb01688cb167415f999dc2908dcf 100644 (file)
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -103,6 +103,7 @@
 #define PHYS_SDRAM_SIZE                        0x04000000      /* 64 megs */
 
 /* DataFlash */
+#define CONFIG_ATMEL_DATAFLASH_SPI
 #define CONFIG_HAS_DATAFLASH           1
 #define CONFIG_SYS_SPI_WRITE_TOUT              (5*CONFIG_SYS_HZ)
 #define CONFIG_SYS_MAX_DATAFLASH_BANKS         2

diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index d6d140a964e9ba664b94b18310aa863313de5e35..cc40d7bda719ed1f26ff67c2f42df999c52b1196 100644 (file)
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -107,6 +107,7 @@
 #define PHYS_SDRAM_SIZE                        0x04000000      /* 64 megs */
 
 /* DataFlash */
+#define CONFIG_ATMEL_DATAFLASH_SPI
 #define CONFIG_HAS_DATAFLASH           1
 #define CONFIG_SYS_SPI_WRITE_TOUT              (5*CONFIG_SYS_HZ)
 #define CONFIG_SYS_MAX_DATAFLASH_BANKS         2

diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index 83baf67ea862f120f4715918898db7d854d9ec7d..cd0c15c97d07c41ca4e6abf77bdc683f8a472eab 100644 (file)
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -108,6 +108,7 @@
 #define PHYS_SDRAM_SIZE                        0x04000000      /* 64 megs */
 
 /* DataFlash */
+#define CONFIG_ATMEL_DATAFLASH_SPI
 #define CONFIG_HAS_DATAFLASH           1
 #define CONFIG_SYS_SPI_WRITE_TOUT              (5*CONFIG_SYS_HZ)
 #define CONFIG_SYS_MAX_DATAFLASH_BANKS         1

diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index a48f2cba5a1fa8d339670dfc2de7f4b248d80f1c..fec48b6b26572c4997bea247651beff9b9bd3349 100644 (file)
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -98,6 +98,7 @@
 #define PHYS_SDRAM_SIZE                        0x04000000      /* 64 megs */
 
 /* DataFlash */
+#define CONFIG_ATMEL_DATAFLASH_SPI
 #define CONFIG_HAS_DATAFLASH           1
 #define CONFIG_SYS_SPI_WRITE_TOUT              (5*CONFIG_SYS_HZ)
 #define CONFIG_SYS_MAX_DATAFLASH_BANKS         1