13 files changed, 38 insertions, 110 deletions
diff --git a/arch/blackfin/mach-bf548/include/mach/blackfin.h b/arch/blackfin/mach-bf548/include/mach/blackfin.h
index bbdcde48d050..72da721a77f5 100644
--- a/arch/blackfin/mach-bf548/include/mach/blackfin.h
+++ b/arch/blackfin/mach-bf548/include/mach/blackfin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2009 Analog Devices Inc.
+ * Copyright 2007-2010 Analog Devices Inc.
 *
 * Licensed under the GPL-2 or later.
 */
@@ -10,43 +10,40 @@
 #include "bf548.h"
 #include "anomaly.h"
+#include <asm/def_LPBlackfin.h>
 #ifdef CONFIG_BF542
-#include "defBF542.h"
+# include "defBF542.h"
 #endif
 #ifdef CONFIG_BF544
-#include "defBF544.h"
+# include "defBF544.h"
 #endif
 #ifdef CONFIG_BF547
-#include "defBF547.h"
+# include "defBF547.h"
 #endif
 #ifdef CONFIG_BF548
-#include "defBF548.h"
+# include "defBF548.h"
 #endif
 #ifdef CONFIG_BF549
-#include "defBF549.h"
+# include "defBF549.h"
-#endif
+#endif
-#if !defined(__ASSEMBLY__)
+#ifndef __ASSEMBLY__
-#ifdef CONFIG_BF542
+# include <asm/cdef_LPBlackfin.h>
-#include "cdefBF542.h"
+# ifdef CONFIG_BF542
-#endif
+#  include "cdefBF542.h"
-#ifdef CONFIG_BF544
+# endif
-#include "cdefBF544.h"
+# ifdef CONFIG_BF544
-#endif
+#  include "cdefBF544.h"
-#ifdef CONFIG_BF547
+# endif
-#include "cdefBF547.h"
+# ifdef CONFIG_BF547
-#endif
+#  include "cdefBF547.h"
-#ifdef CONFIG_BF548
+# endif
-#include "cdefBF548.h"
+# ifdef CONFIG_BF548
-#endif
+#  include "cdefBF548.h"
-#ifdef CONFIG_BF549
+# endif
-#include "cdefBF549.h"
+# ifdef CONFIG_BF549
-#endif
+#  include "cdefBF549.h"
+# endif
 #endif
 #endif
diff --git a/arch/blackfin/mach-bf548/include/mach/cdefBF542.h b/arch/blackfin/mach-bf548/include/mach/cdefBF542.h
index 42f4a9469549..d09c19cd1b7b 100644
--- a/arch/blackfin/mach-bf548/include/mach/cdefBF542.h
+++ b/arch/blackfin/mach-bf548/include/mach/cdefBF542.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2008 Analog Devices Inc.
+ * Copyright 2007-2010 Analog Devices Inc.
 *
 * Licensed under the GPL-2 or later.
 */
@@ -7,14 +7,6 @@
 #ifndef _CDEF_BF542_H
 #define _CDEF_BF542_H
-/* include all Core registers and bit definitions */
-#include "defBF542.h"
-/* include core sbfin_read_()ecific register pointer definitions */
-#include <asm/cdef_LPBlackfin.h>
-/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF542 */
 /* include cdefBF54x_base.h for the set of #defines that are common to all ADSP-BF54x bfin_read_()rocessors */
 #include "cdefBF54x_base.h"
diff --git a/arch/blackfin/mach-bf548/include/mach/cdefBF544.h b/arch/blackfin/mach-bf548/include/mach/cdefBF544.h
index 2207799575ff..33ec8102ceda 100644
--- a/arch/blackfin/mach-bf548/include/mach/cdefBF544.h
+++ b/arch/blackfin/mach-bf548/include/mach/cdefBF544.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2008 Analog Devices Inc.
+ * Copyright 2007-2010 Analog Devices Inc.
 *
 * Licensed under the GPL-2 or later.
 */
@@ -7,14 +7,6 @@
 #ifndef _CDEF_BF544_H
 #define _CDEF_BF544_H
-/* include all Core registers and bit definitions */
-#include "defBF544.h"
-/* include core sbfin_read_()ecific register pointer definitions */
-#include <asm/cdef_LPBlackfin.h>
-/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF544 */
 /* include cdefBF54x_base.h for the set of #defines that are common to all ADSP-BF54x bfin_read_()rocessors */
 #include "cdefBF54x_base.h"
diff --git a/arch/blackfin/mach-bf548/include/mach/cdefBF547.h b/arch/blackfin/mach-bf548/include/mach/cdefBF547.h
index bc650e6ea482..bcb9726dea54 100644
--- a/arch/blackfin/mach-bf548/include/mach/cdefBF547.h
+++ b/arch/blackfin/mach-bf548/include/mach/cdefBF547.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Analog Devices Inc.
+ * Copyright 2008-2010 Analog Devices Inc.
 *
 * Licensed under the GPL-2 or later.
 */
@@ -7,14 +7,6 @@
 #ifndef _CDEF_BF547_H
 #define _CDEF_BF547_H
-/* include all Core registers and bit definitions */
-#include "defBF547.h"
-/* include core sbfin_read_()ecific register pointer definitions */
-#include <asm/cdef_LPBlackfin.h>
-/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF547 */
 /* include cdefBF54x_base.h for the set of #defines that are common to all ADSP-BF54x bfin_read_()rocessors */
 #include "cdefBF54x_base.h"
diff --git a/arch/blackfin/mach-bf548/include/mach/cdefBF548.h b/arch/blackfin/mach-bf548/include/mach/cdefBF548.h
index 3523e08f7968..bae67a65633e 100644
--- a/arch/blackfin/mach-bf548/include/mach/cdefBF548.h
+++ b/arch/blackfin/mach-bf548/include/mach/cdefBF548.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2008 Analog Devices Inc.
+ * Copyright 2007-2010 Analog Devices Inc.
 *
 * Licensed under the GPL-2 or later.
 */
@@ -7,14 +7,6 @@
 #ifndef _CDEF_BF548_H
 #define _CDEF_BF548_H
-/* include all Core registers and bit definitions */
-#include "defBF548.h"
-/* include core sbfin_read_()ecific register pointer definitions */
-#include <asm/cdef_LPBlackfin.h>
-/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF548 */
 /* include cdefBF54x_base.h for the set of #defines that are common to all ADSP-BF54x bfin_read_()rocessors */
 #include "cdefBF54x_base.h"
diff --git a/arch/blackfin/mach-bf548/include/mach/cdefBF549.h b/arch/blackfin/mach-bf548/include/mach/cdefBF549.h
index 80201ed41f80..002136ad5a44 100644
--- a/arch/blackfin/mach-bf548/include/mach/cdefBF549.h
+++ b/arch/blackfin/mach-bf548/include/mach/cdefBF549.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2008 Analog Devices Inc.
+ * Copyright 2007-2010 Analog Devices Inc.
 *
 * Licensed under the GPL-2 or later.
 */
@@ -7,14 +7,6 @@
 #ifndef _CDEF_BF549_H
 #define _CDEF_BF549_H
-/* include all Core registers and bit definitions */
-#include "defBF549.h"
-/* include core sbfin_read_()ecific register pointer definitions */
-#include <asm/cdef_LPBlackfin.h>
-/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF549 */
 /* include cdefBF54x_base.h for the set of #defines that are common to all ADSP-BF54x bfin_read_()rocessors */
 #include "cdefBF54x_base.h"
diff --git a/arch/blackfin/mach-bf548/include/mach/cdefBF54x_base.h b/arch/blackfin/mach-bf548/include/mach/cdefBF54x_base.h
index a805ccbb3299..5e7092182af3 100644
--- a/arch/blackfin/mach-bf548/include/mach/cdefBF54x_base.h
+++ b/arch/blackfin/mach-bf548/include/mach/cdefBF54x_base.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2008 Analog Devices Inc.
+ * Copyright 2007-2010 Analog Devices Inc.
 *
 * Licensed under the GPL-2 or later.
 */
@@ -7,10 +7,6 @@
 #ifndef _CDEF_BF54X_H
 #define _CDEF_BF54X_H
-#include <asm/blackfin.h>
-#include "defBF54x_base.h"
 /* ************************************************************** */
 /* SYSTEM & MMR ADDRESS DEFINITIONS COMMON TO ALL ADSP-BF54x    */
 /* ************************************************************** */
diff --git a/arch/blackfin/mach-bf548/include/mach/defBF542.h b/arch/blackfin/mach-bf548/include/mach/defBF542.h
index abf5f750dd8b..629bf216e2b5 100644
--- a/arch/blackfin/mach-bf548/include/mach/defBF542.h
+++ b/arch/blackfin/mach-bf548/include/mach/defBF542.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2008 Analog Devices Inc.
+ * Copyright 2007-2010 Analog Devices Inc.
 *
 * Licensed under the ADI BSD license or the GPL-2 (or later)
 */
@@ -7,11 +7,6 @@
 #ifndef _DEF_BF542_H
 #define _DEF_BF542_H
-/* Include all Core registers and bit definitions */
-#include <asm/def_LPBlackfin.h>
-/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF542 */
 /* Include defBF54x_base.h for the set of #defines that are common to all ADSP-BF54x processors */
 #include "defBF54x_base.h"
diff --git a/arch/blackfin/mach-bf548/include/mach/defBF544.h b/arch/blackfin/mach-bf548/include/mach/defBF544.h
index e2771094de02..642468c1bcb1 100644
--- a/arch/blackfin/mach-bf548/include/mach/defBF544.h
+++ b/arch/blackfin/mach-bf548/include/mach/defBF544.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2008 Analog Devices Inc.
+ * Copyright 2007-2010 Analog Devices Inc.
 *
 * Licensed under the ADI BSD license or the GPL-2 (or later)
 */
@@ -7,11 +7,6 @@
 #ifndef _DEF_BF544_H
 #define _DEF_BF544_H
-/* Include all Core registers and bit definitions */
-#include <asm/def_LPBlackfin.h>
-/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF544 */
 /* Include defBF54x_base.h for the set of #defines that are common to all ADSP-BF54x processors */
 #include "defBF54x_base.h"
diff --git a/arch/blackfin/mach-bf548/include/mach/defBF547.h b/arch/blackfin/mach-bf548/include/mach/defBF547.h
index be21ba5b3aa8..2f3337cd311e 100644
--- a/arch/blackfin/mach-bf548/include/mach/defBF547.h
+++ b/arch/blackfin/mach-bf548/include/mach/defBF547.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Analog Devices Inc.
+ * Copyright 2008-2010 Analog Devices Inc.
 *
 * Licensed under the ADI BSD license or the GPL-2 (or later)
 */
@@ -7,11 +7,6 @@
 #ifndef _DEF_BF547_H
 #define _DEF_BF547_H
-/* Include all Core registers and bit definitions */
-#include <asm/def_LPBlackfin.h>
-/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF547 */
 /* Include defBF54x_base.h for the set of #defines that are common to all ADSP-BF54x processors */
 #include "defBF54x_base.h"
diff --git a/arch/blackfin/mach-bf548/include/mach/defBF548.h b/arch/blackfin/mach-bf548/include/mach/defBF548.h
index 3fb33b040ab7..3c7f1b69349e 100644
--- a/arch/blackfin/mach-bf548/include/mach/defBF548.h
+++ b/arch/blackfin/mach-bf548/include/mach/defBF548.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2008 Analog Devices Inc.
+ * Copyright 2007-2010 Analog Devices Inc.
 *
 * Licensed under the ADI BSD license or the GPL-2 (or later)
 */
@@ -7,11 +7,6 @@
 #ifndef _DEF_BF548_H
 #define _DEF_BF548_H
-/* Include all Core registers and bit definitions */
-#include <asm/def_LPBlackfin.h>
-/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF548 */
 /* Include defBF54x_base.h for the set of #defines that are common to all ADSP-BF54x processors */
 #include "defBF54x_base.h"
diff --git a/arch/blackfin/mach-bf548/include/mach/defBF549.h b/arch/blackfin/mach-bf548/include/mach/defBF549.h
index 5a04e6d4017e..9a45cb6b30da 100644
--- a/arch/blackfin/mach-bf548/include/mach/defBF549.h
+++ b/arch/blackfin/mach-bf548/include/mach/defBF549.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2008 Analog Devices Inc.
+ * Copyright 2007-2010 Analog Devices Inc.
 *
 * Licensed under the ADI BSD license or the GPL-2 (or later)
 */
@@ -7,11 +7,6 @@
 #ifndef _DEF_BF549_H
 #define _DEF_BF549_H
-/* Include all Core registers and bit definitions */
-#include <asm/def_LPBlackfin.h>
-/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF549 */
 /* Include defBF54x_base.h for the set of #defines that are common to all ADSP-BF54x processors */
 #include "defBF54x_base.h"
diff --git a/arch/blackfin/mach-bf548/include/mach/defBF54x_base.h b/arch/blackfin/mach-bf548/include/mach/defBF54x_base.h
index fef43f59d0ff..0867c2bedb43 100644
--- a/arch/blackfin/mach-bf548/include/mach/defBF54x_base.h
+++ b/arch/blackfin/mach-bf548/include/mach/defBF54x_base.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2008 Analog Devices Inc.
+ * Copyright 2007-2010 Analog Devices Inc.
 *
 * Licensed under the ADI BSD license or the GPL-2 (or later)
 */

diff --git a/arch/blackfin/mach-bf548/include/mach/blackfin.h b/arch/blackfin/mach-bf548/include/mach/blackfin.h index bbdcde48d050..72da721a77f5 100644 --- a/arch/blackfin/mach-bf548/include/mach/blackfin.h +++ b/arch/blackfin/mach-bf548/include/mach/blackfin.h
@@ -1,5 +1,5 @@
1	/*	1	/*
2	* Copyright 2007-2009 Analog Devices Inc.	2	* Copyright 2007-2010 Analog Devices Inc.
3	*	3	*
4	* Licensed under the GPL-2 or later.	4	* Licensed under the GPL-2 or later.
5	*/	5	*/
@@ -10,43 +10,40 @@
10	#include "bf548.h"	10	#include "bf548.h"
11	#include "anomaly.h"	11	#include "anomaly.h"
12		12
		13	#include <asm/def_LPBlackfin.h>
13	#ifdef CONFIG_BF542	14	#ifdef CONFIG_BF542
14	#include "defBF542.h"	15	# include "defBF542.h"
15	#endif	16	#endif
16
17	#ifdef CONFIG_BF544	17	#ifdef CONFIG_BF544
18	#include "defBF544.h"	18	# include "defBF544.h"
19	#endif	19	#endif
20
21	#ifdef CONFIG_BF547	20	#ifdef CONFIG_BF547
22	#include "defBF547.h"	21	# include "defBF547.h"
23	#endif	22	#endif
24
25	#ifdef CONFIG_BF548	23	#ifdef CONFIG_BF548
26	#include "defBF548.h"	24	# include "defBF548.h"
27	#endif	25	#endif
28
29	#ifdef CONFIG_BF549	26	#ifdef CONFIG_BF549
30	#include "defBF549.h"	27	# include "defBF549.h"
31	#endif	28	#endif
32		29
33	#if !defined(__ASSEMBLY__)	30	#ifndef __ASSEMBLY__
34	#ifdef CONFIG_BF542	31	# include <asm/cdef_LPBlackfin.h>
35	#include "cdefBF542.h"	32	# ifdef CONFIG_BF542
36	#endif	33	# include "cdefBF542.h"
37	#ifdef CONFIG_BF544	34	# endif
38	#include "cdefBF544.h"	35	# ifdef CONFIG_BF544
39	#endif	36	# include "cdefBF544.h"
40	#ifdef CONFIG_BF547	37	# endif
41	#include "cdefBF547.h"	38	# ifdef CONFIG_BF547
42	#endif	39	# include "cdefBF547.h"
43	#ifdef CONFIG_BF548	40	# endif
44	#include "cdefBF548.h"	41	# ifdef CONFIG_BF548
45	#endif	42	# include "cdefBF548.h"
46	#ifdef CONFIG_BF549	43	# endif
47	#include "cdefBF549.h"	44	# ifdef CONFIG_BF549
48	#endif	45	# include "cdefBF549.h"
49		46	# endif
50	#endif	47	#endif
51		48
52	#endif	49	#endif


diff --git a/arch/blackfin/mach-bf548/include/mach/cdefBF542.h b/arch/blackfin/mach-bf548/include/mach/cdefBF542.h index 42f4a9469549..d09c19cd1b7b 100644 --- a/arch/blackfin/mach-bf548/include/mach/cdefBF542.h +++ b/arch/blackfin/mach-bf548/include/mach/cdefBF542.h
@@ -1,5 +1,5 @@
1	/*	1	/*
2	* Copyright 2007-2008 Analog Devices Inc.	2	* Copyright 2007-2010 Analog Devices Inc.
3	*	3	*
4	* Licensed under the GPL-2 or later.	4	* Licensed under the GPL-2 or later.
5	*/	5	*/
@@ -7,14 +7,6 @@
7	#ifndef _CDEF_BF542_H	7	#ifndef _CDEF_BF542_H
8	#define _CDEF_BF542_H	8	#define _CDEF_BF542_H
9		9
10	/* include all Core registers and bit definitions */
11	#include "defBF542.h"
12
13	/* include core sbfin_read_()ecific register pointer definitions */
14	#include <asm/cdef_LPBlackfin.h>
15
16	/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF542 */
17
18	/* include cdefBF54x_base.h for the set of #defines that are common to all ADSP-BF54x bfin_read_()rocessors */	10	/* include cdefBF54x_base.h for the set of #defines that are common to all ADSP-BF54x bfin_read_()rocessors */
19	#include "cdefBF54x_base.h"	11	#include "cdefBF54x_base.h"
20		12


diff --git a/arch/blackfin/mach-bf548/include/mach/cdefBF544.h b/arch/blackfin/mach-bf548/include/mach/cdefBF544.h index 2207799575ff..33ec8102ceda 100644 --- a/arch/blackfin/mach-bf548/include/mach/cdefBF544.h +++ b/arch/blackfin/mach-bf548/include/mach/cdefBF544.h
@@ -1,5 +1,5 @@
1	/*	1	/*
2	* Copyright 2007-2008 Analog Devices Inc.	2	* Copyright 2007-2010 Analog Devices Inc.
3	*	3	*
4	* Licensed under the GPL-2 or later.	4	* Licensed under the GPL-2 or later.
5	*/	5	*/
@@ -7,14 +7,6 @@
7	#ifndef _CDEF_BF544_H	7	#ifndef _CDEF_BF544_H
8	#define _CDEF_BF544_H	8	#define _CDEF_BF544_H
9		9
10	/* include all Core registers and bit definitions */
11	#include "defBF544.h"
12
13	/* include core sbfin_read_()ecific register pointer definitions */
14	#include <asm/cdef_LPBlackfin.h>
15
16	/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF544 */
17
18	/* include cdefBF54x_base.h for the set of #defines that are common to all ADSP-BF54x bfin_read_()rocessors */	10	/* include cdefBF54x_base.h for the set of #defines that are common to all ADSP-BF54x bfin_read_()rocessors */
19	#include "cdefBF54x_base.h"	11	#include "cdefBF54x_base.h"
20		12


diff --git a/arch/blackfin/mach-bf548/include/mach/cdefBF547.h b/arch/blackfin/mach-bf548/include/mach/cdefBF547.h index bc650e6ea482..bcb9726dea54 100644 --- a/arch/blackfin/mach-bf548/include/mach/cdefBF547.h +++ b/arch/blackfin/mach-bf548/include/mach/cdefBF547.h
@@ -1,5 +1,5 @@
1	/*	1	/*
2	* Copyright 2008 Analog Devices Inc.	2	* Copyright 2008-2010 Analog Devices Inc.
3	*	3	*
4	* Licensed under the GPL-2 or later.	4	* Licensed under the GPL-2 or later.
5	*/	5	*/
@@ -7,14 +7,6 @@
7	#ifndef _CDEF_BF547_H	7	#ifndef _CDEF_BF547_H
8	#define _CDEF_BF547_H	8	#define _CDEF_BF547_H
9		9
10	/* include all Core registers and bit definitions */
11	#include "defBF547.h"
12
13	/* include core sbfin_read_()ecific register pointer definitions */
14	#include <asm/cdef_LPBlackfin.h>
15
16	/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF547 */
17
18	/* include cdefBF54x_base.h for the set of #defines that are common to all ADSP-BF54x bfin_read_()rocessors */	10	/* include cdefBF54x_base.h for the set of #defines that are common to all ADSP-BF54x bfin_read_()rocessors */
19	#include "cdefBF54x_base.h"	11	#include "cdefBF54x_base.h"
20		12


diff --git a/arch/blackfin/mach-bf548/include/mach/cdefBF548.h b/arch/blackfin/mach-bf548/include/mach/cdefBF548.h index 3523e08f7968..bae67a65633e 100644 --- a/arch/blackfin/mach-bf548/include/mach/cdefBF548.h +++ b/arch/blackfin/mach-bf548/include/mach/cdefBF548.h
@@ -1,5 +1,5 @@
1	/*	1	/*
2	* Copyright 2007-2008 Analog Devices Inc.	2	* Copyright 2007-2010 Analog Devices Inc.
3	*	3	*
4	* Licensed under the GPL-2 or later.	4	* Licensed under the GPL-2 or later.
5	*/	5	*/
@@ -7,14 +7,6 @@
7	#ifndef _CDEF_BF548_H	7	#ifndef _CDEF_BF548_H
8	#define _CDEF_BF548_H	8	#define _CDEF_BF548_H
9		9
10	/* include all Core registers and bit definitions */
11	#include "defBF548.h"
12
13	/* include core sbfin_read_()ecific register pointer definitions */
14	#include <asm/cdef_LPBlackfin.h>
15
16	/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF548 */
17
18	/* include cdefBF54x_base.h for the set of #defines that are common to all ADSP-BF54x bfin_read_()rocessors */	10	/* include cdefBF54x_base.h for the set of #defines that are common to all ADSP-BF54x bfin_read_()rocessors */
19	#include "cdefBF54x_base.h"	11	#include "cdefBF54x_base.h"
20		12


diff --git a/arch/blackfin/mach-bf548/include/mach/cdefBF549.h b/arch/blackfin/mach-bf548/include/mach/cdefBF549.h index 80201ed41f80..002136ad5a44 100644 --- a/arch/blackfin/mach-bf548/include/mach/cdefBF549.h +++ b/arch/blackfin/mach-bf548/include/mach/cdefBF549.h
@@ -1,5 +1,5 @@
1	/*	1	/*
2	* Copyright 2007-2008 Analog Devices Inc.	2	* Copyright 2007-2010 Analog Devices Inc.
3	*	3	*
4	* Licensed under the GPL-2 or later.	4	* Licensed under the GPL-2 or later.
5	*/	5	*/
@@ -7,14 +7,6 @@
7	#ifndef _CDEF_BF549_H	7	#ifndef _CDEF_BF549_H
8	#define _CDEF_BF549_H	8	#define _CDEF_BF549_H
9		9
10	/* include all Core registers and bit definitions */
11	#include "defBF549.h"
12
13	/* include core sbfin_read_()ecific register pointer definitions */
14	#include <asm/cdef_LPBlackfin.h>
15
16	/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF549 */
17
18	/* include cdefBF54x_base.h for the set of #defines that are common to all ADSP-BF54x bfin_read_()rocessors */	10	/* include cdefBF54x_base.h for the set of #defines that are common to all ADSP-BF54x bfin_read_()rocessors */
19	#include "cdefBF54x_base.h"	11	#include "cdefBF54x_base.h"
20		12


diff --git a/arch/blackfin/mach-bf548/include/mach/cdefBF54x_base.h b/arch/blackfin/mach-bf548/include/mach/cdefBF54x_base.h index a805ccbb3299..5e7092182af3 100644 --- a/arch/blackfin/mach-bf548/include/mach/cdefBF54x_base.h +++ b/arch/blackfin/mach-bf548/include/mach/cdefBF54x_base.h
@@ -1,5 +1,5 @@
1	/*	1	/*
2	* Copyright 2007-2008 Analog Devices Inc.	2	* Copyright 2007-2010 Analog Devices Inc.
3	*	3	*
4	* Licensed under the GPL-2 or later.	4	* Licensed under the GPL-2 or later.
5	*/	5	*/
@@ -7,10 +7,6 @@
7	#ifndef _CDEF_BF54X_H	7	#ifndef _CDEF_BF54X_H
8	#define _CDEF_BF54X_H	8	#define _CDEF_BF54X_H
9		9
10	#include <asm/blackfin.h>
11
12	#include "defBF54x_base.h"
13
14	/* ************************************************************** */	10	/* ************************************************************** */
15	/* SYSTEM & MMR ADDRESS DEFINITIONS COMMON TO ALL ADSP-BF54x */	11	/* SYSTEM & MMR ADDRESS DEFINITIONS COMMON TO ALL ADSP-BF54x */
16	/* ************************************************************** */	12	/* ************************************************************** */


diff --git a/arch/blackfin/mach-bf548/include/mach/defBF542.h b/arch/blackfin/mach-bf548/include/mach/defBF542.h index abf5f750dd8b..629bf216e2b5 100644 --- a/arch/blackfin/mach-bf548/include/mach/defBF542.h +++ b/arch/blackfin/mach-bf548/include/mach/defBF542.h
@@ -1,5 +1,5 @@
1	/*	1	/*
2	* Copyright 2007-2008 Analog Devices Inc.	2	* Copyright 2007-2010 Analog Devices Inc.
3	*	3	*
4	* Licensed under the ADI BSD license or the GPL-2 (or later)	4	* Licensed under the ADI BSD license or the GPL-2 (or later)
5	*/	5	*/
@@ -7,11 +7,6 @@
7	#ifndef _DEF_BF542_H	7	#ifndef _DEF_BF542_H
8	#define _DEF_BF542_H	8	#define _DEF_BF542_H
9		9
10	/* Include all Core registers and bit definitions */
11	#include <asm/def_LPBlackfin.h>
12
13	/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF542 */
14
15	/* Include defBF54x_base.h for the set of #defines that are common to all ADSP-BF54x processors */	10	/* Include defBF54x_base.h for the set of #defines that are common to all ADSP-BF54x processors */
16	#include "defBF54x_base.h"	11	#include "defBF54x_base.h"
17		12


diff --git a/arch/blackfin/mach-bf548/include/mach/defBF544.h b/arch/blackfin/mach-bf548/include/mach/defBF544.h index e2771094de02..642468c1bcb1 100644 --- a/arch/blackfin/mach-bf548/include/mach/defBF544.h +++ b/arch/blackfin/mach-bf548/include/mach/defBF544.h
@@ -1,5 +1,5 @@
1	/*	1	/*
2	* Copyright 2007-2008 Analog Devices Inc.	2	* Copyright 2007-2010 Analog Devices Inc.
3	*	3	*
4	* Licensed under the ADI BSD license or the GPL-2 (or later)	4	* Licensed under the ADI BSD license or the GPL-2 (or later)
5	*/	5	*/
@@ -7,11 +7,6 @@
7	#ifndef _DEF_BF544_H	7	#ifndef _DEF_BF544_H
8	#define _DEF_BF544_H	8	#define _DEF_BF544_H
9		9
10	/* Include all Core registers and bit definitions */
11	#include <asm/def_LPBlackfin.h>
12
13	/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF544 */
14
15	/* Include defBF54x_base.h for the set of #defines that are common to all ADSP-BF54x processors */	10	/* Include defBF54x_base.h for the set of #defines that are common to all ADSP-BF54x processors */
16	#include "defBF54x_base.h"	11	#include "defBF54x_base.h"
17		12


diff --git a/arch/blackfin/mach-bf548/include/mach/defBF547.h b/arch/blackfin/mach-bf548/include/mach/defBF547.h index be21ba5b3aa8..2f3337cd311e 100644 --- a/arch/blackfin/mach-bf548/include/mach/defBF547.h +++ b/arch/blackfin/mach-bf548/include/mach/defBF547.h
@@ -1,5 +1,5 @@
1	/*	1	/*
2	* Copyright 2008 Analog Devices Inc.	2	* Copyright 2008-2010 Analog Devices Inc.
3	*	3	*
4	* Licensed under the ADI BSD license or the GPL-2 (or later)	4	* Licensed under the ADI BSD license or the GPL-2 (or later)
5	*/	5	*/
@@ -7,11 +7,6 @@
7	#ifndef _DEF_BF547_H	7	#ifndef _DEF_BF547_H
8	#define _DEF_BF547_H	8	#define _DEF_BF547_H
9		9
10	/* Include all Core registers and bit definitions */
11	#include <asm/def_LPBlackfin.h>
12
13	/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF547 */
14
15	/* Include defBF54x_base.h for the set of #defines that are common to all ADSP-BF54x processors */	10	/* Include defBF54x_base.h for the set of #defines that are common to all ADSP-BF54x processors */
16	#include "defBF54x_base.h"	11	#include "defBF54x_base.h"
17		12


diff --git a/arch/blackfin/mach-bf548/include/mach/defBF548.h b/arch/blackfin/mach-bf548/include/mach/defBF548.h index 3fb33b040ab7..3c7f1b69349e 100644 --- a/arch/blackfin/mach-bf548/include/mach/defBF548.h +++ b/arch/blackfin/mach-bf548/include/mach/defBF548.h
@@ -1,5 +1,5 @@
1	/*	1	/*
2	* Copyright 2007-2008 Analog Devices Inc.	2	* Copyright 2007-2010 Analog Devices Inc.
3	*	3	*
4	* Licensed under the ADI BSD license or the GPL-2 (or later)	4	* Licensed under the ADI BSD license or the GPL-2 (or later)
5	*/	5	*/
@@ -7,11 +7,6 @@
7	#ifndef _DEF_BF548_H	7	#ifndef _DEF_BF548_H
8	#define _DEF_BF548_H	8	#define _DEF_BF548_H
9		9
10	/* Include all Core registers and bit definitions */
11	#include <asm/def_LPBlackfin.h>
12
13	/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF548 */
14
15	/* Include defBF54x_base.h for the set of #defines that are common to all ADSP-BF54x processors */	10	/* Include defBF54x_base.h for the set of #defines that are common to all ADSP-BF54x processors */
16	#include "defBF54x_base.h"	11	#include "defBF54x_base.h"
17		12


diff --git a/arch/blackfin/mach-bf548/include/mach/defBF549.h b/arch/blackfin/mach-bf548/include/mach/defBF549.h index 5a04e6d4017e..9a45cb6b30da 100644 --- a/arch/blackfin/mach-bf548/include/mach/defBF549.h +++ b/arch/blackfin/mach-bf548/include/mach/defBF549.h
@@ -1,5 +1,5 @@
1	/*	1	/*
2	* Copyright 2007-2008 Analog Devices Inc.	2	* Copyright 2007-2010 Analog Devices Inc.
3	*	3	*
4	* Licensed under the ADI BSD license or the GPL-2 (or later)	4	* Licensed under the ADI BSD license or the GPL-2 (or later)
5	*/	5	*/
@@ -7,11 +7,6 @@
7	#ifndef _DEF_BF549_H	7	#ifndef _DEF_BF549_H
8	#define _DEF_BF549_H	8	#define _DEF_BF549_H
9		9
10	/* Include all Core registers and bit definitions */
11	#include <asm/def_LPBlackfin.h>
12
13	/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF549 */
14
15	/* Include defBF54x_base.h for the set of #defines that are common to all ADSP-BF54x processors */	10	/* Include defBF54x_base.h for the set of #defines that are common to all ADSP-BF54x processors */
16	#include "defBF54x_base.h"	11	#include "defBF54x_base.h"
17		12


diff --git a/arch/blackfin/mach-bf548/include/mach/defBF54x_base.h b/arch/blackfin/mach-bf548/include/mach/defBF54x_base.h index fef43f59d0ff..0867c2bedb43 100644 --- a/arch/blackfin/mach-bf548/include/mach/defBF54x_base.h +++ b/arch/blackfin/mach-bf548/include/mach/defBF54x_base.h
@@ -1,5 +1,5 @@
1	/*	1	/*
2	* Copyright 2007-2008 Analog Devices Inc.	2	* Copyright 2007-2010 Analog Devices Inc.
3	*	3	*
4	* Licensed under the ADI BSD license or the GPL-2 (or later)	4	* Licensed under the ADI BSD license or the GPL-2 (or later)
5	*/	5	*/