summaryrefslogtreecommitdiffstats
path: root/arch/blackfin/mach-bf537/include/mach/cdefBF537.h
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-10-26 23:46:22 -0400
committerMike Frysinger <vapier@gentoo.org>2011-01-10 07:18:08 -0500
commit1a5c226528990515c603bae04233016411b44159 (patch)
treec3f1fa9565c601ccbf00289e37f9c3d4ea258324 /arch/blackfin/mach-bf537/include/mach/cdefBF537.h
parent51946b10cfc741bfdcb82ea6ba65e775702f3a27 (diff)
downloadblackbird-op-linux-1a5c226528990515c603bae04233016411b44159.tar.gz
blackbird-op-linux-1a5c226528990515c603bae04233016411b44159.zip
Blackfin: clean up mach header includes
The main asm/blackfin.h header will pull in mach/blackfin.h to get all the fun Blackfin defines. So having any of the sub-mach headers trying to include asm/blackfin.h makes no sense -- punt it. The mach/blackfin.h header takes care of including the part-specific def headers which in turn will include any other needed def file. Similarly, it takes care of pulling in the part-specific cdef header. So move this logic out of the blackfin.h when necessary. Further, make sure the cdef headers do not waste time including the def headers again. Since all parts need the common def/cdef headers, move this logic out of the part-specific headers and into the mach/blackfin.h file. Finally, we need to split the BF539 def header since the BF538 does not have MXVR and we don't want to expose those MMRs. So now all parts should have the same behavior: mach/blackfin.h asm/def_LPBlackfin.h part-specific def.h if ! asm asm/cdef_LPBlackfin.h part-specific cdef.h And the sub def/cdef headers only tail into what they need. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin/mach-bf537/include/mach/cdefBF537.h')
-rw-r--r--arch/blackfin/mach-bf537/include/mach/cdefBF537.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/blackfin/mach-bf537/include/mach/cdefBF537.h b/arch/blackfin/mach-bf537/include/mach/cdefBF537.h
index 9363c3990421..19ec21ea150a 100644
--- a/arch/blackfin/mach-bf537/include/mach/cdefBF537.h
+++ b/arch/blackfin/mach-bf537/include/mach/cdefBF537.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2008 Analog Devices Inc.
+ * Copyright 2005-2010 Analog Devices Inc.
*
* Licensed under the GPL-2 or later
*/
@@ -10,9 +10,6 @@
/* Include MMRs Common to BF534 */
#include "cdefBF534.h"
-/* Include all Core registers and bit definitions */
-#include "defBF537.h"
-
/* Include Macro "Defines" For EMAC (Unique to BF536/BF537 */
/* 10/100 Ethernet Controller (0xFFC03000 - 0xFFC031FF) */
#define bfin_read_EMAC_OPMODE() bfin_read32(EMAC_OPMODE)
OpenPOWER on IntegriCloud