1 files changed, 15 insertions, 22 deletions
diff --git a/arch/blackfin/mach-bf538/include/mach/blackfin.h b/arch/blackfin/mach-bf538/include/mach/blackfin.h
index 08b5eabb1ed5..791d08400cf0 100644
--- a/arch/blackfin/mach-bf538/include/mach/blackfin.h
+++ b/arch/blackfin/mach-bf538/include/mach/blackfin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2009 Analog Devices Inc.
+ * Copyright 2008-2010 Analog Devices Inc.
 *
 * Licensed under the GPL-2 or later.
 */
@@ -10,31 +10,24 @@
 #define BF538_FAMILY
 #include "bf538.h"
-#include "defBF539.h"
 #include "anomaly.h"
+#include <asm/def_LPBlackfin.h>
-#if !defined(__ASSEMBLY__)
+#ifdef CONFIG_BF538
-#include "cdefBF538.h"
+# include "defBF538.h"
-#if defined(CONFIG_BF539)
-#include "cdefBF539.h"
 #endif
+#ifdef CONFIG_BF539
+# include "defBF539.h"
 #endif
-#define BFIN_UART_NR_PORTS      3
+#ifndef __ASSEMBLY__
+# include <asm/cdef_LPBlackfin.h>
-#define OFFSET_THR              0x00    /* Transmit Holding register            */
+# ifdef CONFIG_BF538
-#define OFFSET_RBR              0x00    /* Receive Buffer register              */
+#  include "cdefBF538.h"
-#define OFFSET_DLL              0x00    /* Divisor Latch (Low-Byte)             */
+# endif
-#define OFFSET_IER              0x04    /* Interrupt Enable Register            */
+# ifdef CONFIG_BF539
-#define OFFSET_DLH              0x04    /* Divisor Latch (High-Byte)            */
+#  include "cdefBF539.h"
-#define OFFSET_IIR              0x08    /* Interrupt Identification Register    */
+# endif
-#define OFFSET_LCR              0x0C    /* Line Control Register                */
+#endif
-#define OFFSET_MCR              0x10    /* Modem Control Register               */
-#define OFFSET_LSR              0x14    /* Line Status Register                 */
-#define OFFSET_MSR              0x18    /* Modem Status Register                */
-#define OFFSET_SCR              0x1C    /* SCR Scratch Register                 */
-#define OFFSET_GCTL             0x24    /* Global Control Register              */
 #endif

diff --git a/arch/blackfin/mach-bf538/include/mach/blackfin.h b/arch/blackfin/mach-bf538/include/mach/blackfin.h index 08b5eabb1ed5..791d08400cf0 100644 --- a/arch/blackfin/mach-bf538/include/mach/blackfin.h +++ b/arch/blackfin/mach-bf538/include/mach/blackfin.h
@@ -1,5 +1,5 @@
1	/*	1	/*
2	* Copyright 2008-2009 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	*/
@@ -10,31 +10,24 @@
10	#define BF538_FAMILY	10	#define BF538_FAMILY
11		11
12	#include "bf538.h"	12	#include "bf538.h"
13	#include "defBF539.h"
14	#include "anomaly.h"	13	#include "anomaly.h"
15		14
16		15	#include <asm/def_LPBlackfin.h>
17	#if !defined(__ASSEMBLY__)	16	#ifdef CONFIG_BF538
18	#include "cdefBF538.h"	17	# include "defBF538.h"
19
20	#if defined(CONFIG_BF539)
21	#include "cdefBF539.h"
22	#endif	18	#endif
		19	#ifdef CONFIG_BF539
		20	# include "defBF539.h"
23	#endif	21	#endif
24		22
25	#define BFIN_UART_NR_PORTS 3	23	#ifndef __ASSEMBLY__
26		24	# include <asm/cdef_LPBlackfin.h>
27	#define OFFSET_THR 0x00 /* Transmit Holding register */	25	# ifdef CONFIG_BF538
28	#define OFFSET_RBR 0x00 /* Receive Buffer register */	26	# include "cdefBF538.h"
29	#define OFFSET_DLL 0x00 /* Divisor Latch (Low-Byte) */	27	# endif
30	#define OFFSET_IER 0x04 /* Interrupt Enable Register */	28	# ifdef CONFIG_BF539
31	#define OFFSET_DLH 0x04 /* Divisor Latch (High-Byte) */	29	# include "cdefBF539.h"
32	#define OFFSET_IIR 0x08 /* Interrupt Identification Register */	30	# endif
33	#define OFFSET_LCR 0x0C /* Line Control Register */	31	#endif
34	#define OFFSET_MCR 0x10 /* Modem Control Register */
35	#define OFFSET_LSR 0x14 /* Line Status Register */
36	#define OFFSET_MSR 0x18 /* Modem Status Register */
37	#define OFFSET_SCR 0x1C /* SCR Scratch Register */
38	#define OFFSET_GCTL 0x24 /* Global Control Register */
39		32
40	#endif	33	#endif