diff options
Diffstat (limited to 'arch/blackfin/mach-bf527')
9 files changed, 30 insertions, 53 deletions
diff --git a/arch/blackfin/mach-bf527/include/mach/blackfin.h b/arch/blackfin/mach-bf527/include/mach/blackfin.h index 1ede5e127449..e1d279274487 100644 --- a/arch/blackfin/mach-bf527/include/mach/blackfin.h +++ b/arch/blackfin/mach-bf527/include/mach/blackfin.h | |||
@@ -1,34 +1,37 @@ | |||
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 | */ |
6 | 6 | ||
7 | #ifndef _MACH_BLACKFIN_H_ | 7 | #ifndef _MACH_BLACKFIN_H_ |
8 | #define _MACH_BLACKFIN_H_ | 8 | #define _MACH_BLACKFIN_H_ |
9 | 9 | ||
10 | #include "bf527.h" | 10 | #include "bf527.h" |
11 | #include "defBF522.h" | ||
12 | #include "anomaly.h" | 11 | #include "anomaly.h" |
13 | 12 | ||
14 | #if defined(CONFIG_BF527) || defined(CONFIG_BF526) | 13 | #include <asm/def_LPBlackfin.h> |
15 | #include "defBF527.h" | 14 | #if defined(CONFIG_BF523) || defined(CONFIG_BF522) |
15 | # include "defBF522.h" | ||
16 | #endif | 16 | #endif |
17 | |||
18 | #if defined(CONFIG_BF525) || defined(CONFIG_BF524) | 17 | #if defined(CONFIG_BF525) || defined(CONFIG_BF524) |
19 | #include "defBF525.h" | 18 | # include "defBF525.h" |
20 | #endif | 19 | #endif |
21 | |||
22 | #if !defined(__ASSEMBLY__) | ||
23 | #include "cdefBF522.h" | ||
24 | |||
25 | #if defined(CONFIG_BF527) || defined(CONFIG_BF526) | 20 | #if defined(CONFIG_BF527) || defined(CONFIG_BF526) |
26 | #include "cdefBF527.h" | 21 | # include "defBF527.h" |
27 | #endif | 22 | #endif |
28 | 23 | ||
29 | #if defined(CONFIG_BF525) || defined(CONFIG_BF524) | 24 | #if !defined(__ASSEMBLY__) |
30 | #include "cdefBF525.h" | 25 | # include <asm/cdef_LPBlackfin.h> |
31 | #endif | 26 | # if defined(CONFIG_BF523) || defined(CONFIG_BF522) |
27 | # include "cdefBF522.h" | ||
28 | # endif | ||
29 | # if defined(CONFIG_BF525) || defined(CONFIG_BF524) | ||
30 | # include "cdefBF525.h" | ||
31 | # endif | ||
32 | # if defined(CONFIG_BF527) || defined(CONFIG_BF526) | ||
33 | # include "cdefBF527.h" | ||
34 | # endif | ||
32 | #endif | 35 | #endif |
33 | 36 | ||
34 | #endif | 37 | #endif |
diff --git a/arch/blackfin/mach-bf527/include/mach/cdefBF522.h b/arch/blackfin/mach-bf527/include/mach/cdefBF522.h index 1079af8c7aef..238a9c5e89a4 100644 --- a/arch/blackfin/mach-bf527/include/mach/cdefBF522.h +++ b/arch/blackfin/mach-bf527/include/mach/cdefBF522.h | |||
@@ -1,20 +1,12 @@ | |||
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 | */ |
6 | 6 | ||
7 | #ifndef _CDEF_BF522_H | 7 | #ifndef _CDEF_BF522_H |
8 | #define _CDEF_BF522_H | 8 | #define _CDEF_BF522_H |
9 | 9 | ||
10 | /* include all Core registers and bit definitions */ | ||
11 | #include "defBF522.h" | ||
12 | |||
13 | /* include core specific register pointer definitions */ | ||
14 | #include <asm/cdef_LPBlackfin.h> | ||
15 | |||
16 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF522 */ | ||
17 | |||
18 | /* include cdefBF52x_base.h for the set of #defines that are common to all ADSP-BF52x processors */ | 10 | /* include cdefBF52x_base.h for the set of #defines that are common to all ADSP-BF52x processors */ |
19 | #include "cdefBF52x_base.h" | 11 | #include "cdefBF52x_base.h" |
20 | 12 | ||
diff --git a/arch/blackfin/mach-bf527/include/mach/cdefBF525.h b/arch/blackfin/mach-bf527/include/mach/cdefBF525.h index d7e2751c6bcc..d90a85b6b6b9 100644 --- a/arch/blackfin/mach-bf527/include/mach/cdefBF525.h +++ b/arch/blackfin/mach-bf527/include/mach/cdefBF525.h | |||
@@ -1,15 +1,12 @@ | |||
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 | */ |
6 | 6 | ||
7 | #ifndef _CDEF_BF525_H | 7 | #ifndef _CDEF_BF525_H |
8 | #define _CDEF_BF525_H | 8 | #define _CDEF_BF525_H |
9 | 9 | ||
10 | /* include all Core registers and bit definitions */ | ||
11 | #include "defBF525.h" | ||
12 | |||
13 | /* BF525 is BF522 + USB */ | 10 | /* BF525 is BF522 + USB */ |
14 | #include "cdefBF522.h" | 11 | #include "cdefBF522.h" |
15 | 12 | ||
diff --git a/arch/blackfin/mach-bf527/include/mach/cdefBF527.h b/arch/blackfin/mach-bf527/include/mach/cdefBF527.h index c7ba544d50b6..eb22f5866105 100644 --- a/arch/blackfin/mach-bf527/include/mach/cdefBF527.h +++ b/arch/blackfin/mach-bf527/include/mach/cdefBF527.h | |||
@@ -1,15 +1,12 @@ | |||
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 | */ |
6 | 6 | ||
7 | #ifndef _CDEF_BF527_H | 7 | #ifndef _CDEF_BF527_H |
8 | #define _CDEF_BF527_H | 8 | #define _CDEF_BF527_H |
9 | 9 | ||
10 | /* include all Core registers and bit definitions */ | ||
11 | #include "defBF527.h" | ||
12 | |||
13 | /* BF527 is BF525 + EMAC */ | 10 | /* BF527 is BF525 + EMAC */ |
14 | #include "cdefBF525.h" | 11 | #include "cdefBF525.h" |
15 | 12 | ||
diff --git a/arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h b/arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h index 4e484efeb46f..ced5e129c3bc 100644 --- a/arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h +++ b/arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h | |||
@@ -1,19 +1,12 @@ | |||
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 | */ |
6 | 6 | ||
7 | #ifndef _CDEF_BF52X_H | 7 | #ifndef _CDEF_BF52X_H |
8 | #define _CDEF_BF52X_H | 8 | #define _CDEF_BF52X_H |
9 | 9 | ||
10 | #include <asm/blackfin.h> | ||
11 | |||
12 | #include "defBF52x_base.h" | ||
13 | |||
14 | /* Include core specific register pointer definitions */ | ||
15 | #include <asm/cdef_LPBlackfin.h> | ||
16 | |||
17 | /* ==== begin from cdefBF534.h ==== */ | 10 | /* ==== begin from cdefBF534.h ==== */ |
18 | 11 | ||
19 | /* Clock and System Control (0xFFC00000 - 0xFFC000FF) */ | 12 | /* Clock and System Control (0xFFC00000 - 0xFFC000FF) */ |
diff --git a/arch/blackfin/mach-bf527/include/mach/defBF522.h b/arch/blackfin/mach-bf527/include/mach/defBF522.h index cb139a254810..b1da029f1d6c 100644 --- a/arch/blackfin/mach-bf527/include/mach/defBF522.h +++ b/arch/blackfin/mach-bf527/include/mach/defBF522.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_BF522_H | 7 | #ifndef _DEF_BF522_H |
8 | #define _DEF_BF522_H | 8 | #define _DEF_BF522_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-BF522 */ | ||
14 | |||
15 | /* Include defBF52x_base.h for the set of #defines that are common to all ADSP-BF52x processors */ | 10 | /* Include defBF52x_base.h for the set of #defines that are common to all ADSP-BF52x processors */ |
16 | #include "defBF52x_base.h" | 11 | #include "defBF52x_base.h" |
17 | 12 | ||
diff --git a/arch/blackfin/mach-bf527/include/mach/defBF525.h b/arch/blackfin/mach-bf527/include/mach/defBF525.h index c136f7032962..cc383adfdffa 100644 --- a/arch/blackfin/mach-bf527/include/mach/defBF525.h +++ b/arch/blackfin/mach-bf527/include/mach/defBF525.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 | */ |
diff --git a/arch/blackfin/mach-bf527/include/mach/defBF527.h b/arch/blackfin/mach-bf527/include/mach/defBF527.h index 4dd58fb33156..05369a92fbc8 100644 --- a/arch/blackfin/mach-bf527/include/mach/defBF527.h +++ b/arch/blackfin/mach-bf527/include/mach/defBF527.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 | */ |
diff --git a/arch/blackfin/mach-bf527/include/mach/defBF52x_base.h b/arch/blackfin/mach-bf527/include/mach/defBF52x_base.h index a408100f4c30..640990e07db0 100644 --- a/arch/blackfin/mach-bf527/include/mach/defBF52x_base.h +++ b/arch/blackfin/mach-bf527/include/mach/defBF52x_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 | */ |