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>

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

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

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

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

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

drivers/nand/Kconfig

@@ -41,7 +41,7 @@ config NAND_OMAP_GPMC_HWECC
 config NAND_ATMEL
 	bool
 	prompt "Atmel (AT91SAM9xxx) NAND driver"
-	depends on ARCH_AT91SAM9
+	depends on ARCH_AT91
 
 config NAND_S3C24X0
 	bool

drivers/net/Kconfig

@@ -66,7 +66,7 @@ config DRIVER_NET_FEC_IMX
 
 config DRIVER_NET_MACB
 	bool "macb Ethernet driver"
-	depends on ARCH_AT91SAM9
+	depends on ARCH_AT91
 	select MIIPHY
 
 config DRIVER_NET_TAP

drivers/net/macb.c

@@ -264,7 +264,7 @@ static int macb_init(struct eth_device *edev)
 	else
 		val &= ~MACB_BIT(RMII);
 
-#if defined(CONFIG_ARCH_AT91SAM9)
+#if defined(CONFIG_ARCH_AT91)
 	val |= MACB_BIT(CLKEN);
 #endif
 	writel(val, macb->regs + MACB_USRIO);

drivers/serial/Kconfig

@@ -32,7 +32,7 @@ config DRIVER_SERIAL_NS16550
 	  Enable this to get support for NS16550 based serial devices
 
 config DRIVER_SERIAL_ATMEL
-	depends on ARCH_AT91SAM9
+	depends on ARCH_AT91
 	default y
 	bool "Atmel serial driver"