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 d0d47e6..34e7461 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 6e2c121..1350f3e 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 72881ab..de938f7 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 2f4baed..b978731 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 29cabcf..bcc65bd 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 d6d140a..cc40d7b 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 83baf67..cd0c15c 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 a48f2cb..fec48b6 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