sama5: use correct soc and board names: sama5d3 for soc name, sama5d3xek for board name.

In this patch, we
  1. change the soc file and board directory to correct name.
  2. change the macro name from CONFIG_AT91SAMA5 to CONFIG_SAMA5D3.
  3. change the defconfig name to sama5d3xek_xxx.

15 files changed, 28 insertions, 28 deletions

diff --git a/arch/arm/cpu/armv7/at91/Makefile b/arch/arm/cpu/armv7/at91/Makefile
index 5ad88b395e..a4d29bf906 100644
--- a/arch/arm/cpu/armv7/at91/Makefile
+++ b/arch/arm/cpu/armv7/at91/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib$(SOC).o
 
-COBJS-$(CONFIG_AT91SAMA5)	+= at91sama5_devices.o
+COBJS-$(CONFIG_SAMA5D3)	+= sama5d3_devices.o
 COBJS-y += clock.o
 COBJS-y += cpu.o
 COBJS-y	+= reset.o
diff --git a/arch/arm/cpu/armv7/at91/at91sama5_devices.c b/arch/arm/cpu/armv7/at91/sama5d3_devices.c
index 6104d214b4..bd6a70b6cd 100644
--- a/arch/arm/cpu/armv7/at91/at91sama5_devices.c
+++ b/arch/arm/cpu/armv7/at91/sama5d3_devices.c
@@ -21,7 +21,7 @@
  */
 
 #include <common.h>
-#include <asm/arch/at91sama5.h>
+#include <asm/arch/sama5d3.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/at91_pmc.h>
 #include <asm/arch/clk.h>
diff --git a/arch/arm/include/asm/arch-at91/hardware.h b/arch/arm/include/asm/arch-at91/hardware.h
index dac322da1e..6dfab9c36e 100644
--- a/arch/arm/include/asm/arch-at91/hardware.h
+++ b/arch/arm/include/asm/arch-at91/hardware.h
@@ -39,8 +39,8 @@
 # include <asm/arch/at91sam9g45.h>
 #elif defined(CONFIG_AT91SAM9X5)
 # include <asm/arch/at91sam9x5.h>
-#elif defined(CONFIG_AT91SAMA5)
-# include <asm/arch/at91sama5.h>
+#elif defined(CONFIG_SAMA5D3)
+# include <asm/arch/sama5d3.h>
 #elif defined(CONFIG_AT91CAP9)
 # include <asm/arch/at91cap9.h>
 #elif defined(CONFIG_AT91X40)
diff --git a/arch/arm/include/asm/arch-at91/at91sama5.h b/arch/arm/include/asm/arch-at91/sama5d3.h
index f694431220..27dfffc895 100644
--- a/arch/arm/include/asm/arch-at91/at91sama5.h
+++ b/arch/arm/include/asm/arch-at91/sama5d3.h
@@ -1,10 +1,10 @@
 /*
- * Chip-specific header file for the AT91SAMA5 family
+ * Chip-specific header file for the SAMA5D3 family
  *
  * (C) 2012 Atmel Corporation.
  *
  * Definitions for the SoC:
- * AT91SAMA5
+ * SAMA5D3
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -12,8 +12,8 @@
  * (at your option) any later version.
  */
 
-#ifndef AT91SAMA5_H
-#define AT91SAMA5_H
+#ifndef SAMA5D3_H
+#define SAMA5D3_H
 
 /*
  * defines to be used in other places
@@ -205,7 +205,7 @@
 #define CONFIG_SYS_AT91_UNKNOWN_CPU	"Unknown CPU type"
 
 /*
- * AT91SAMA5 specific prototypes
+ * SAMA5D3 specific prototypes
  */
 #ifndef __ASSEMBLY__
 unsigned int get_chip_id(void);
diff --git a/arch/arm/include/asm/arch-at91/at91sama5_smc.h b/arch/arm/include/asm/arch-at91/sama5d3_smc.h
index 22370e0b8f..b09dc1c06d 100644
--- a/arch/arm/include/asm/arch-at91/at91sama5_smc.h
+++ b/arch/arm/include/asm/arch-at91/sama5d3_smc.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2012 Atmel Corporation.
  *
  * Static Memory Controllers (SMC) - System peripherals registers.
- * Based on AT91SAMA5 datasheet.
+ * Based on SAMA5D3 datasheet.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -10,8 +10,8 @@
  * (at your option) any later version.
  */
 
-#ifndef AT91SAMA5_SMC_H
-#define AT91SAMA5_SMC_H
+#ifndef SAMA5D3_SMC_H
+#define SAMA5D3_SMC_H
 
 #ifdef __ASSEMBLY__
 
diff --git a/board/atmel/at91sama5ek/Makefile b/board/atmel/sama5d3xek/Makefile
index bfb26b149d..357bb7c15c 100644
--- a/board/atmel/at91sama5ek/Makefile
+++ b/board/atmel/sama5d3xek/Makefile
@@ -29,7 +29,7 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib$(BOARD).o
 
-COBJS-y += at91sama5ek.o
+COBJS-y += sama5d3xek.o
 
 SRCS	:= $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS-y))
diff --git a/board/atmel/at91sama5ek/config.mk b/board/atmel/sama5d3xek/config.mk
index 6589a12a93..6589a12a93 100644
--- a/board/atmel/at91sama5ek/config.mk
+++ b/board/atmel/sama5d3xek/config.mk
diff --git a/board/atmel/at91sama5ek/at91sama5ek.c b/board/atmel/sama5d3xek/sama5d3xek.c
index 52868685c9..f68c200591 100644
--- a/board/atmel/at91sama5ek/at91sama5ek.c
+++ b/board/atmel/sama5d3xek/sama5d3xek.c
@@ -23,7 +23,7 @@
 #include <common.h>
 #include <mmc.h>
 #include <asm/io.h>
-#include <asm/arch/at91sama5_smc.h>
+#include <asm/arch/sama5d3_smc.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/at91_pmc.h>
 #include <asm/arch/at91_rstc.h>
diff --git a/boards.cfg b/boards.cfg
index 7472da7f19..f2061c9488 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -94,9 +94,6 @@ at91sam9g20ek_dataflash_cs0  arm         arm926ejs   at91sam9260ek       atmel
 at91sam9g20ek_dataflash_cs1  arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9G20,SYS_USE_DATAFLASH_CS1
 at91sam9g20ek_nandflash      arm         arm926ejs   at91sam9260ek       atmel          at91        at91sam9260ek:AT91SAM9G20,SYS_USE_NANDFLASH
 at91sam9m10g45ek_nandflash   arm         arm926ejs   at91sam9m10g45ek    atmel          at91        at91sam9m10g45ek:AT91SAM9M10G45,SYS_USE_NANDFLASH
-at91sama5ek_nandflash        arm         armv7       at91sama5ek         atmel          at91        at91sama5ek:AT91SAMA5,SYS_USE_NANDFLASH
-at91sama5ek_serialflash      arm         armv7       at91sama5ek         atmel          at91        at91sama5ek:AT91SAMA5,SYS_USE_SERIALFLASH
-at91sama5ek_sdcard	     arm         armv7       at91sama5ek         atmel          at91        at91sama5ek:AT91SAMA5,SYS_USE_MMC
 at91sam9rlek_dataflash       arm         arm926ejs   at91sam9rlek        atmel          at91        at91sam9rlek:AT91SAM9RL,SYS_USE_DATAFLASH
 at91sam9rlek_nandflash       arm         arm926ejs   at91sam9rlek        atmel          at91        at91sam9rlek:AT91SAM9RL,SYS_USE_NANDFLASH
 at91sam9x5ek_nandflash       arm         arm926ejs   at91sam9x5ek        atmel          at91        at91sam9x5ek:AT91SAM9X5,SYS_USE_NANDFLASH
@@ -229,6 +226,9 @@ integratorap_cm946es         arm         arm946es    integrator          armltd
 integratorcp_cm946es         arm         arm946es    integrator          armltd         -               integratorcp:CM946ES
 ca9x4_ct_vxp                 arm         armv7       vexpress            armltd
 am335x_evm                   arm         armv7       am335x              ti             am33xx
+sama5d3xek_nandflash         arm         armv7       sama5d3xek          atmel          at91        sama5d3xek:SAMA5D3,SYS_USE_NANDFLASH
+sama5d3xek_serialflash       arm         armv7       sama5d3xek          atmel          at91        sama5d3xek:SAMA5D3,SYS_USE_SERIALFLASH
+sama5d3xek_sdcard	     arm         armv7       sama5d3xek          atmel          at91        sama5d3xek:SAMA5D3,SYS_USE_MMC
 highbank                     arm         armv7       highbank            -              highbank
 mx51_efikamx                 arm         armv7       mx51_efikamx        genesi         mx5		mx51_efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKAMX,IMX_CONFIG=board/genesi/mx51_efikamx/imximage_mx.cfg
 mx51_efikasb                 arm         armv7       mx51_efikamx        genesi         mx5		mx51_efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKASB,IMX_CONFIG=board/genesi/mx51_efikamx/imximage_sb.cfg
diff --git a/drivers/mmc/gen_atmel_mci.c b/drivers/mmc/gen_atmel_mci.c
index 1e104f6fe1..741619fb14 100644
--- a/drivers/mmc/gen_atmel_mci.c
+++ b/drivers/mmc/gen_atmel_mci.c
@@ -83,7 +83,7 @@ static void mci_set_mode(struct mmc *mmc, u32 hz, u32 blklen)
 
 	blklen &= 0xfffc;
 	/* On some platforms RDPROOF and WRPROOF are ignored */
-#ifdef CONFIG_AT91SAMA5
+#ifdef CONFIG_SAMA5D3
 	writel((MMCI_BF(CLKDIV, clkdiv)
 		 | MMCI_BIT(RDPROOF)
 		 | MMCI_BIT(WRPROOF)), &mci->mr);
diff --git a/drivers/net/gmacb.c b/drivers/net/gmacb.c
index d65e61d47c..418e8b064c 100644
--- a/drivers/net/gmacb.c
+++ b/drivers/net/gmacb.c
@@ -505,7 +505,7 @@ static int macb_init(struct eth_device *netdev, bd_t *bd)
 
 	/* choose RMII or MII mode. This depends on the board */
 #ifdef CONFIG_RGMII
-#if defined(CONFIG_AT91SAMA5)
+#if defined(CONFIG_SAMA5D3)
 	macb_writel(macb, UR, MACB_BIT(RGMII));
 #else
 	macb_writel(macb, UR, 0);
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index f05a566521..d85f192f5f 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -472,7 +472,7 @@ static int macb_init(struct eth_device *netdev, bd_t *bd)
 	defined(CONFIG_AT91SAM9263) || defined(CONFIG_AT91SAM9G20) || \
 	defined(CONFIG_AT91SAM9G45) || defined(CONFIG_AT91SAM9M10G45) || \
 	defined(CONFIG_AT91SAM9XE) || defined(CONFIG_AT91SAM9X5) || \
-	defined(CONFIG_AT91SAMA5)
+	defined(CONFIG_SAMA5D3)
 	macb_writel(macb, USRIO, MACB_BIT(RMII) | MACB_BIT(CLKEN));
 #else
 	macb_writel(macb, USRIO, 0);
@@ -482,7 +482,7 @@ static int macb_init(struct eth_device *netdev, bd_t *bd)
 	defined(CONFIG_AT91SAM9263) || defined(CONFIG_AT91SAM9G20) || \
 	defined(CONFIG_AT91SAM9G45) || defined(CONFIG_AT91SAM9M10G45) || \
 	defined(CONFIG_AT91SAM9XE) || defined(CONFIG_AT91SAM9X5) || \
-	defined(CONFIG_AT91SAMA5)
+	defined(CONFIG_SAMA5D3)
 	macb_writel(macb, USRIO, MACB_BIT(CLKEN));
 #else
 	macb_writel(macb, USRIO, MACB_BIT(MII));
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index 48de03d36b..e2af1b6da5 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -42,7 +42,7 @@ int usb_cpu_init(void)
 	while ((readl(&pmc->sr) & AT91_PMC_LOCKB) != AT91_PMC_LOCKB)
 		;
 #elif defined(CONFIG_AT91SAM9G45) || defined(CONFIG_AT91SAM9M10G45) \
-	|| defined(CONFIG_AT91SAMA5)
+	|| defined(CONFIG_SAMA5D3)
 	/* Enable UPLL */
 	writel(readl(&pmc->uckr) | AT91_PMC_UPLLEN | AT91_PMC_BIASEN,
 		&pmc->uckr);
@@ -53,7 +53,7 @@ int usb_cpu_init(void)
 	writel(AT91_PMC_USBS_USB_UPLL | AT91_PMC_USBDIV_10, &pmc->usb);
 #endif
 
-#if defined(CONFIG_AT91SAMA5)
+#if defined(CONFIG_SAMA5D3)
 	/* Enable USB host clock. */
 	writel(1 << (ATMEL_ID_UHP - 32), &pmc->pcer1);
 #else
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index 860cbcc4d2..63d6965448 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -28,7 +28,7 @@
 #include <asm/arch/clk.h>
 #include <lcd.h>
 #include <atmel_lcdc.h>
-#if defined(CONFIG_AT91SAM9X5) || defined(CONFIG_AT91SAMA5)
+#if defined(CONFIG_AT91SAM9X5) || defined(CONFIG_SAMA5D3)
 #include <atmel_9x5_lcdc.h>
 #endif
 
@@ -69,7 +69,7 @@ void lcd_setcolreg(ushort regno, ushort red, ushort green, ushort blue)
 #endif
 }
 
-#if defined(CONFIG_AT91SAM9X5) || defined(CONFIG_AT91SAMA5)
+#if defined(CONFIG_AT91SAM9X5) || defined(CONFIG_SAMA5D3)
 void lcd_9x5_ctrl_init(void *lcdbase)
 {
 	unsigned long value;
@@ -246,7 +246,7 @@ void lcd_ctrl_init(void *lcdbase)
 {
 	unsigned long value;
 
-#if defined(CONFIG_AT91SAM9X5) || defined(CONFIG_AT91SAMA5)
+#if defined(CONFIG_AT91SAM9X5) || defined(CONFIG_SAMA5D3)
 	return lcd_9x5_ctrl_init(lcdbase);
 #endif
 
diff --git a/include/configs/at91sama5ek.h b/include/configs/sama5d3xek.h
index 373c67cff8..95eb14846e 100644
--- a/include/configs/at91sama5ek.h
+++ b/include/configs/sama5d3xek.h
@@ -1,5 +1,5 @@
 /*
- * Configuation settings for the AT91SAMA5EK board.
+ * Configuation settings for the SAMA5D3xEK board.
  *
  * Copyright (C) 2012 - 2013 Atmel
  *
@@ -38,7 +38,7 @@
 #define CONFIG_SYS_AT91_MAIN_CLOCK      12000000 /* from 12 MHz crystal */
 #define CONFIG_SYS_HZ		        1000
 
-#define CONFIG_AT91SAMA5EK
+#define CONFIG_SAMA5D3XEK
 #define CONFIG_AT91FAMILY
 #define CONFIG_ARCH_CPU_INIT
 #undef CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff	*/