at91sam9: move to at91

this will allow to add at91rm9200 with the same api as done in the kernel

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

10 files changed, 9 insertions, 8 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 441dfb637f..2a6546ba11 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -77,17 +77,18 @@ config ARCH_NETX
 config ARCH_OMAP
 	bool
 
-config ARCH_AT91SAM9
+config ARCH_AT91
 	bool
-	select ARM926EJS
 
 config ARCH_AT91SAM9260
 	bool
-	select ARCH_AT91SAM9
+	select ARM926EJS
+	select ARCH_AT91
 
 config ARCH_AT91SAM9263
 	bool
-	select ARCH_AT91SAM9
+	select ARM926EJS
+	select ARCH_AT91
 	select MACH_HAS_LOWLEVEL_INIT
 
 choice
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 83fe532724..fc54996848 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -6,7 +6,7 @@ machine-$(CONFIG_ARCH_IMX)	   := imx
 machine-$(CONFIG_ARCH_NETX)	   := netx
 machine-$(CONFIG_ARCH_AT91RM9200)  := at91rm9200
 machine-$(CONFIG_ARCH_OMAP)        := omap
-machine-$(CONFIG_ARCH_AT91SAM9)    := at91sam9
+machine-$(CONFIG_ARCH_AT91)	   := at91
 machine-$(CONFIG_ARCH_S3C24xx)     := s3c24xx
 board-$(CONFIG_MACH_MX1ADS)	   := mx1ads
 board-$(CONFIG_MACH_ECO920)	   := eco920
diff --git a/arch/arm/configs/at91sam9260ek_defconfig b/arch/arm/configs/at91sam9260ek_defconfig
index d47566fe4d..492005fa6c 100644
--- a/arch/arm/configs/at91sam9260ek_defconfig
+++ b/arch/arm/configs/at91sam9260ek_defconfig
@@ -9,7 +9,7 @@ CONFIG_BOARDINFO="Atmel 91SAM9260-EK"
 CONFIG_GENERIC_LINKER_SCRIPT=y
 CONFIG_ARM=y
 CONFIG_ARM926EJS=y
-CONFIG_ARCH_AT91SAM9=y
+CONFIG_ARCH_AT91=y
 CONFIG_ARCH_AT91SAM9260=y
 # CONFIG_MACH_MX1ADS is not set
 # CONFIG_MACH_SCB9328 is not set
diff --git a/arch/arm/configs/mmccpu_defconfig b/arch/arm/configs/mmccpu_defconfig
index 44aff4c9ca..5d31fc078f 100644
--- a/arch/arm/configs/mmccpu_defconfig
+++ b/arch/arm/configs/mmccpu_defconfig
@@ -9,7 +9,7 @@ CONFIG_BOARDINFO="Bucyrus MMC-CPU"
 CONFIG_GENERIC_LINKER_SCRIPT=y
 CONFIG_ARM=y
 CONFIG_ARM926EJS=y
-CONFIG_ARCH_AT91SAM9=y
+CONFIG_ARCH_AT91=y
 CONFIG_ARCH_AT91SAM9263=y
 # CONFIG_MACH_MX1ADS is not set
 # CONFIG_MACH_SCB9328 is not set
diff --git a/arch/arm/configs/pm9263_defconfig b/arch/arm/configs/pm9263_defconfig
index 682eacba78..eda317d559 100644
--- a/arch/arm/configs/pm9263_defconfig
+++ b/arch/arm/configs/pm9263_defconfig
@@ -9,7 +9,7 @@ CONFIG_BOARDINFO="Ronetix PM9263"
 CONFIG_GENERIC_LINKER_SCRIPT=y
 CONFIG_ARM=y
 CONFIG_ARM926EJS=y
-CONFIG_ARCH_AT91SAM9=y
+CONFIG_ARCH_AT91=y
 CONFIG_ARCH_AT91SAM9263=y
 # CONFIG_MACH_MX1ADS is not set
 # CONFIG_MACH_SCB9328 is not set
diff --git a/arch/arm/mach-at91sam9/Makefile b/arch/arm/mach-at91/Makefile
index 5d57900c33..5d57900c33 100644
--- a/arch/arm/mach-at91sam9/Makefile
+++ b/arch/arm/mach-at91/Makefile
diff --git a/arch/arm/mach-at91sam9/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
index 04e954b039..04e954b039 100644
--- a/arch/arm/mach-at91sam9/at91sam9260.c
+++ b/arch/arm/mach-at91/at91sam9260.c
diff --git a/arch/arm/mach-at91sam9/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c
index 8688b979eb..8688b979eb 100644
--- a/arch/arm/mach-at91sam9/at91sam9263.c
+++ b/arch/arm/mach-at91/at91sam9263.c
diff --git a/arch/arm/mach-at91sam9/clocksource.c b/arch/arm/mach-at91/clocksource.c
index 86a51d584e..86a51d584e 100644
--- a/arch/arm/mach-at91sam9/clocksource.c
+++ b/arch/arm/mach-at91/clocksource.c
diff --git a/arch/arm/mach-at91sam9/gpio.c b/arch/arm/mach-at91/gpio.c
index 09894b7fd0..09894b7fd0 100644
--- a/arch/arm/mach-at91sam9/gpio.c
+++ b/arch/arm/mach-at91/gpio.c