diff options
Diffstat (limited to 'arch/blackfin/mach-bf537')
-rw-r--r-- | arch/blackfin/mach-bf537/include/mach/blackfin.h | 23 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/include/mach/cdefBF534.h | 10 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/include/mach/cdefBF537.h | 5 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/include/mach/defBF534.h | 5 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/include/mach/defBF537.h | 5 |
5 files changed, 18 insertions, 30 deletions
diff --git a/arch/blackfin/mach-bf537/include/mach/blackfin.h b/arch/blackfin/mach-bf537/include/mach/blackfin.h index 1f8a41bc074..baa096fc724 100644 --- a/arch/blackfin/mach-bf537/include/mach/blackfin.h +++ b/arch/blackfin/mach-bf537/include/mach/blackfin.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright 2005-2009 Analog Devices Inc. | 2 | * Copyright 2005-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_ |
@@ -10,19 +10,24 @@ | |||
10 | #define BF537_FAMILY | 10 | #define BF537_FAMILY |
11 | 11 | ||
12 | #include "bf537.h" | 12 | #include "bf537.h" |
13 | #include "defBF534.h" | ||
14 | #include "anomaly.h" | 13 | #include "anomaly.h" |
15 | 14 | ||
15 | #include <asm/def_LPBlackfin.h> | ||
16 | #ifdef CONFIG_BF534 | ||
17 | # include "defBF534.h" | ||
18 | #endif | ||
16 | #if defined(CONFIG_BF537) || defined(CONFIG_BF536) | 19 | #if defined(CONFIG_BF537) || defined(CONFIG_BF536) |
17 | #include "defBF537.h" | 20 | # include "defBF537.h" |
18 | #endif | 21 | #endif |
19 | 22 | ||
20 | #if !defined(__ASSEMBLY__) | 23 | #if !defined(__ASSEMBLY__) |
21 | #include "cdefBF534.h" | 24 | # include <asm/cdef_LPBlackfin.h> |
22 | 25 | # ifdef CONFIG_BF534 | |
23 | #if defined(CONFIG_BF537) || defined(CONFIG_BF536) | 26 | # include "cdefBF534.h" |
24 | #include "cdefBF537.h" | 27 | # endif |
25 | #endif | 28 | # if defined(CONFIG_BF537) || defined(CONFIG_BF536) |
29 | # include "cdefBF537.h" | ||
30 | # endif | ||
26 | #endif | 31 | #endif |
27 | 32 | ||
28 | #endif | 33 | #endif |
diff --git a/arch/blackfin/mach-bf537/include/mach/cdefBF534.h b/arch/blackfin/mach-bf537/include/mach/cdefBF534.h index 68ea8553c2c..057b494583d 100644 --- a/arch/blackfin/mach-bf537/include/mach/cdefBF534.h +++ b/arch/blackfin/mach-bf537/include/mach/cdefBF534.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright 2005-2008 Analog Devices Inc. | 2 | * Copyright 2005-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_BF534_H | 7 | #ifndef _CDEF_BF534_H |
8 | #define _CDEF_BF534_H | 8 | #define _CDEF_BF534_H |
9 | 9 | ||
10 | #include <asm/blackfin.h> | ||
11 | |||
12 | /* Include all Core registers and bit definitions */ | ||
13 | #include "defBF534.h" | ||
14 | |||
15 | /* Include core specific register pointer definitions */ | ||
16 | #include <asm/cdef_LPBlackfin.h> | ||
17 | |||
18 | /* Clock and System Control (0xFFC00000 - 0xFFC000FF) */ | 10 | /* Clock and System Control (0xFFC00000 - 0xFFC000FF) */ |
19 | #define bfin_read_PLL_CTL() bfin_read16(PLL_CTL) | 11 | #define bfin_read_PLL_CTL() bfin_read16(PLL_CTL) |
20 | #define bfin_read_PLL_DIV() bfin_read16(PLL_DIV) | 12 | #define bfin_read_PLL_DIV() bfin_read16(PLL_DIV) |
diff --git a/arch/blackfin/mach-bf537/include/mach/cdefBF537.h b/arch/blackfin/mach-bf537/include/mach/cdefBF537.h index 9363c399042..19ec21ea150 100644 --- a/arch/blackfin/mach-bf537/include/mach/cdefBF537.h +++ b/arch/blackfin/mach-bf537/include/mach/cdefBF537.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright 2005-2008 Analog Devices Inc. | 2 | * Copyright 2005-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,9 +10,6 @@ | |||
10 | /* Include MMRs Common to BF534 */ | 10 | /* Include MMRs Common to BF534 */ |
11 | #include "cdefBF534.h" | 11 | #include "cdefBF534.h" |
12 | 12 | ||
13 | /* Include all Core registers and bit definitions */ | ||
14 | #include "defBF537.h" | ||
15 | |||
16 | /* Include Macro "Defines" For EMAC (Unique to BF536/BF537 */ | 13 | /* Include Macro "Defines" For EMAC (Unique to BF536/BF537 */ |
17 | /* 10/100 Ethernet Controller (0xFFC03000 - 0xFFC031FF) */ | 14 | /* 10/100 Ethernet Controller (0xFFC03000 - 0xFFC031FF) */ |
18 | #define bfin_read_EMAC_OPMODE() bfin_read32(EMAC_OPMODE) | 15 | #define bfin_read_EMAC_OPMODE() bfin_read32(EMAC_OPMODE) |
diff --git a/arch/blackfin/mach-bf537/include/mach/defBF534.h b/arch/blackfin/mach-bf537/include/mach/defBF534.h index bfcd82ed635..32529a03b26 100644 --- a/arch/blackfin/mach-bf537/include/mach/defBF534.h +++ b/arch/blackfin/mach-bf537/include/mach/defBF534.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright 2005-2008 Analog Devices Inc. | 2 | * Copyright 2005-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,9 +7,6 @@ | |||
7 | #ifndef _DEF_BF534_H | 7 | #ifndef _DEF_BF534_H |
8 | #define _DEF_BF534_H | 8 | #define _DEF_BF534_H |
9 | 9 | ||
10 | /* Include all Core registers and bit definitions */ | ||
11 | #include <asm/def_LPBlackfin.h> | ||
12 | |||
13 | /************************************************************************************ | 10 | /************************************************************************************ |
14 | ** System MMR Register Map | 11 | ** System MMR Register Map |
15 | *************************************************************************************/ | 12 | *************************************************************************************/ |
diff --git a/arch/blackfin/mach-bf537/include/mach/defBF537.h b/arch/blackfin/mach-bf537/include/mach/defBF537.h index 8cb5d5cf0c9..3d471d75268 100644 --- a/arch/blackfin/mach-bf537/include/mach/defBF537.h +++ b/arch/blackfin/mach-bf537/include/mach/defBF537.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright 2005-2008 Analog Devices Inc. | 2 | * Copyright 2005-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,9 +7,6 @@ | |||
7 | #ifndef _DEF_BF537_H | 7 | #ifndef _DEF_BF537_H |
8 | #define _DEF_BF537_H | 8 | #define _DEF_BF537_H |
9 | 9 | ||
10 | /* Include all Core registers and bit definitions*/ | ||
11 | #include <asm/cdef_LPBlackfin.h> | ||
12 | |||
13 | /* Include all MMR and bit defines common to BF534 */ | 10 | /* Include all MMR and bit defines common to BF534 */ |
14 | #include "defBF534.h" | 11 | #include "defBF534.h" |
15 | 12 | ||