ARM: at91: change board files into SoC files

As board files are now DT only and can address all aspects of the SoC family,
we can rename them so that the mach-at91 directory looks cleaner.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
index 3362f51ffd8202334e16f2f0e1d26454916894b9..827fdbcce1c7a69c1a8372db97c99e90e3019452 100644 (file)
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -7,14 +7,9 @@ obj-y          := setup.o
 obj-$(CONFIG_SOC_AT91SAM9)     += sam9_smc.o
 
 # CPU-specific support
-obj-$(CONFIG_SOC_AT91RM9200)   += at91rm9200_time.o
-
-# AT91SAM board with device-tree
-obj-$(CONFIG_SOC_AT91RM9200) += board-dt-rm9200.o
-obj-$(CONFIG_SOC_AT91SAM9) += board-dt-sam9.o
-
-# SAMA5 board with device-tree
-obj-$(CONFIG_SOC_SAMA5)                += board-dt-sama5.o
+obj-$(CONFIG_SOC_AT91RM9200)   += at91rm9200.o at91rm9200_time.o
+obj-$(CONFIG_SOC_AT91SAM9)     += at91sam9.o
+obj-$(CONFIG_SOC_SAMA5)                += sama5.o
 
 # Power Management
 obj-$(CONFIG_PM)               += pm.o

diff --git a/arch/arm/mach-at91/board-dt-rm9200.c b/arch/arm/mach-at91/at91rm9200.c
similarity index 95%
rename from arch/arm/mach-at91/board-dt-rm9200.c
rename to arch/arm/mach-at91/at91rm9200.c
index 5fcd1c73ece0bb91fcd835da29b2b4dc608812bf..ec89806c9d5d354f3536efccbfa96308ec3583f6 100644 (file)
--- a/arch/arm/mach-at91/board-dt-rm9200.c
+++ b/arch/arm/mach-at91/at91rm9200.c
@@ -1,5 +1,5 @@
 /*
- *  Setup code for AT91RM9200 Evaluation Kits with Device Tree support
+ *  Setup code for AT91RM9200
  *
  *  Copyright (C) 2011 Atmel,
  *                2011 Nicolas Ferre <nicolas.ferre@atmel.com>

diff --git a/arch/arm/mach-at91/board-dt-sam9.c b/arch/arm/mach-at91/at91sam9.c
similarity index 96%
rename from arch/arm/mach-at91/board-dt-sam9.c
rename to arch/arm/mach-at91/at91sam9.c
index f5d922e57655dd542ab215be3b2c179e09f4da7c..04a9af79aadb7d83595cbc4270a42643787d8abb 100644 (file)
--- a/arch/arm/mach-at91/board-dt-sam9.c
+++ b/arch/arm/mach-at91/at91sam9.c
@@ -1,5 +1,5 @@
 /*
- *  Setup code for AT91SAM Evaluation Kits with Device Tree support
+ *  Setup code for AT91SAM9
  *
  *  Copyright (C) 2011 Atmel,
  *                2011 Nicolas Ferre <nicolas.ferre@atmel.com>

diff --git a/arch/arm/mach-at91/board-dt-sama5.c b/arch/arm/mach-at91/sama5.c
similarity index 97%
rename from arch/arm/mach-at91/board-dt-sama5.c
rename to arch/arm/mach-at91/sama5.c
index f9a1b0261f72abfea91577d123b7da374ddc32eb..22944d7e1a63ce1fd6a396d2e4306e3677ce652a 100644 (file)
--- a/arch/arm/mach-at91/board-dt-sama5.c
+++ b/arch/arm/mach-at91/sama5.c
@@ -1,5 +1,5 @@
 /*
- *  Setup code for SAMA5 Evaluation Kits with Device Tree support
+ *  Setup code for SAMA5
  *
  *  Copyright (C) 2013 Atmel,
  *                2013 Ludovic Desroches <ludovic.desroches@atmel.com>