arm: mvebu: Change header macros from ARMADA_XP to MVEBU

Since these files will be used for other MVEBU SoC's, lets reflect this in the headers marcos as well. Signed-off-by: Stefan Roese <sr@denx.de> Tested-by: Kevin Smith <kevin.smith@elecsyscorp.com> Tested-by: Dirk Eibach <dirk.eibach@gdsys.cc>

arm: mvebu: Change header macros from ARMADA_XP to MVEBU
Since these files will be used for other MVEBU SoC's, lets reflect this in the headers marcos as well. Signed-off-by: Stefan Roese <sr@denx.de> Tested-by: Kevin Smith <kevin.smith@elecsyscorp.com> Tested-by: Dirk Eibach <dirk.eibach@gdsys.cc>
Stefan Roese · Luka Perkov
1 parent d078765640
Showing 3 changed files with 10 additions and 10 deletions Side-by-side Diff
arch/arm/mach-mvebu/include/mach/config.h
arch/arm/mach-mvebu/include/mach/cpu.h
arch/arm/mach-mvebu/include/mach/soc.h
@@ -12,8 +12,8 @@
  * It supports common definitions for Armada XP platforms
  */
  
-#ifndef _ARMADA_XP_CONFIG_H
-#define _ARMADA_XP_CONFIG_H
+#ifndef _MVEBU_CONFIG_H
+#define _MVEBU_CONFIG_H
  
 #include <asm/arch/soc.h>
  
@@ -83,5 +83,5 @@
 #define CONFIG_SYS_I2C_SPEED		100000
 #endif
  
-#endif /* _ARMADA_XP_CONFIG_H */
+#endif /* __MVEBU_CONFIG_H */
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
  
-#ifndef _ARMADA_XP_CPU_H
-#define _ARMADA_XP_CPU_H
+#ifndef _MVEBU_CPU_H
+#define _MVEBU_CPU_H
  
 #include <asm/system.h>
  
@@ -120,5 +120,5 @@
  */
 int ddr3_init(void);
 #endif /* __ASSEMBLY__ */
-#endif /* _ARMADA_XP_CPU_H */
+#endif /* _MVEBU_CPU_H */
@@ -8,8 +8,8 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
  
-#ifndef _ASM_ARCH_ARMADA_XP_H
-#define _ASM_ARCH_ARMADA_XP_H
+#ifndef _MVEBU_SOC_H
+#define _MVEBU_SOC_H
  
 #define SOC_MV78460_ID		0x7846
  
  
@@ -49,10 +49,10 @@
 /* Armada XP GbE controller has 4 ports */
 #define MAX_MVNETA_DEVS		4
  
-/* Kirkwood CPU memory windows */
+/* MVEBU CPU memory windows */
 #define MVCPU_WIN_CTRL_DATA	CPU_WIN_CTRL_DATA
 #define MVCPU_WIN_ENABLE	CPU_WIN_ENABLE
 #define MVCPU_WIN_DISABLE	CPU_WIN_DISABLE
  
-#endif /* _ASM_ARCH_ARMADA_XP_H */
+#endif /* _MVEBU_SOC_H */
...	...	@@ -12,8 +12,8 @@
12	12	* It supports common definitions for Armada XP platforms
13	13	*/
14	14
15		-#ifndef _ARMADA_XP_CONFIG_H
16		-#define _ARMADA_XP_CONFIG_H
	15	+#ifndef _MVEBU_CONFIG_H
	16	+#define _MVEBU_CONFIG_H
17	17
18	18	#include <asm/arch/soc.h>
19	19
...	...	@@ -83,5 +83,5 @@
83	83	#define CONFIG_SYS_I2C_SPEED 100000
84	84	#endif
85	85
86		-#endif /* _ARMADA_XP_CONFIG_H */
	86	+#endif /* __MVEBU_CONFIG_H */
...	...	@@ -6,8 +6,8 @@
6	6	* SPDX-License-Identifier: GPL-2.0+
7	7	*/
8	8
9		-#ifndef _ARMADA_XP_CPU_H
10		-#define _ARMADA_XP_CPU_H
	9	+#ifndef _MVEBU_CPU_H
	10	+#define _MVEBU_CPU_H
11	11
12	12	#include <asm/system.h>
13	13
...	...	@@ -120,5 +120,5 @@
120	120	*/
121	121	int ddr3_init(void);
122	122	#endif /* __ASSEMBLY__ */
123		-#endif /* _ARMADA_XP_CPU_H */
	123	+#endif /* _MVEBU_CPU_H */
...	...	@@ -8,8 +8,8 @@
8	8	* SPDX-License-Identifier: GPL-2.0+
9	9	*/
10	10
11		-#ifndef _ASM_ARCH_ARMADA_XP_H
12		-#define _ASM_ARCH_ARMADA_XP_H
	11	+#ifndef _MVEBU_SOC_H
	12	+#define _MVEBU_SOC_H
13	13
14	14	#define SOC_MV78460_ID 0x7846
15	15
16	16
...	...	@@ -49,10 +49,10 @@
49	49	/* Armada XP GbE controller has 4 ports */
50	50	#define MAX_MVNETA_DEVS 4
51	51
52		-/* Kirkwood CPU memory windows */
	52	+/* MVEBU CPU memory windows */
53	53	#define MVCPU_WIN_CTRL_DATA CPU_WIN_CTRL_DATA
54	54	#define MVCPU_WIN_ENABLE CPU_WIN_ENABLE
55	55	#define MVCPU_WIN_DISABLE CPU_WIN_DISABLE
56	56
57		-#endif /* _ASM_ARCH_ARMADA_XP_H */
	57	+#endif /* _MVEBU_SOC_H */