1 files changed, 1 insertions, 112 deletions
diff --git a/arch/arm/mach-omap2/serial.h b/arch/arm/mach-omap2/serial.h
index 6a6806271fcf..c4014f013df0 100644
--- a/arch/arm/mach-omap2/serial.h
+++ b/arch/arm/mach-omap2/serial.h
@@ -1,112 +1 @@
-/*
+#include <mach/serial.h>
- * arch/arm/plat-omap/include/mach/serial.h
- *
- * Copyright (C) 2009 Texas Instruments
- * Added OMAP4 support- Santosh Shilimkar <santosh.shilimkar@ti.com>
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- */
-#ifndef __ASM_ARCH_SERIAL_H
-#define __ASM_ARCH_SERIAL_H
-#include <linux/init.h>
-/*
- * Memory entry used for the DEBUG_LL UART configuration, relative to
- * start of RAM. See also uncompress.h and debug-macro.S.
- *
- * Note that using a memory location for storing the UART configuration
- * has at least two limitations:
- *
- * 1. Kernel uncompress code cannot overlap OMAP_UART_INFO as the
- *    uncompress code could then partially overwrite itself
- * 2. We assume printascii is called at least once before paging_init,
- *    and addruart has a chance to read OMAP_UART_INFO
- */
-#define OMAP_UART_INFO_OFS      0x3ffc
-/* OMAP2 serial ports */
-#define OMAP2_UART1_BASE        0x4806a000
-#define OMAP2_UART2_BASE        0x4806c000
-#define OMAP2_UART3_BASE        0x4806e000
-/* OMAP3 serial ports */
-#define OMAP3_UART1_BASE        OMAP2_UART1_BASE
-#define OMAP3_UART2_BASE        OMAP2_UART2_BASE
-#define OMAP3_UART3_BASE        0x49020000
-#define OMAP3_UART4_BASE        0x49042000      /* Only on 36xx */
-#define OMAP3_UART4_AM35XX_BASE 0x4809E000      /* Only on AM35xx */
-/* OMAP4 serial ports */
-#define OMAP4_UART1_BASE        OMAP2_UART1_BASE
-#define OMAP4_UART2_BASE        OMAP2_UART2_BASE
-#define OMAP4_UART3_BASE        0x48020000
-#define OMAP4_UART4_BASE        0x4806e000
-/* TI81XX serial ports */
-#define TI81XX_UART1_BASE       0x48020000
-#define TI81XX_UART2_BASE       0x48022000
-#define TI81XX_UART3_BASE       0x48024000
-/* AM3505/3517 UART4 */
-#define AM35XX_UART4_BASE       0x4809E000      /* Only on AM3505/3517 */
-/* AM33XX serial port */
-#define AM33XX_UART1_BASE       0x44E09000
-/* OMAP5 serial ports */
-#define OMAP5_UART1_BASE        OMAP2_UART1_BASE
-#define OMAP5_UART2_BASE        OMAP2_UART2_BASE
-#define OMAP5_UART3_BASE        OMAP4_UART3_BASE
-#define OMAP5_UART4_BASE        OMAP4_UART4_BASE
-#define OMAP5_UART5_BASE        0x48066000
-#define OMAP5_UART6_BASE        0x48068000
-/* External port on Zoom2/3 */
-#define ZOOM_UART_BASE          0x10000000
-#define ZOOM_UART_VIRT          0xfa400000
-#define OMAP_PORT_SHIFT         2
-#define ZOOM_PORT_SHIFT         1
-#define OMAP24XX_BASE_BAUD      (48000000/16)
-/*
- * DEBUG_LL port encoding stored into the UART1 scratchpad register by
- * decomp_setup in uncompress.h
- */
-#define OMAP2UART1              21
-#define OMAP2UART2              22
-#define OMAP2UART3              23
-#define OMAP3UART1              OMAP2UART1
-#define OMAP3UART2              OMAP2UART2
-#define OMAP3UART3              33
-#define OMAP3UART4              34              /* Only on 36xx */
-#define OMAP4UART1              OMAP2UART1
-#define OMAP4UART2              OMAP2UART2
-#define OMAP4UART3              43
-#define OMAP4UART4              44
-#define TI81XXUART1             81
-#define TI81XXUART2             82
-#define TI81XXUART3             83
-#define AM33XXUART1             84
-#define OMAP5UART3              OMAP4UART3
-#define OMAP5UART4              OMAP4UART4
-#define ZOOM_UART               95              /* Only on zoom2/3 */
-#ifndef __ASSEMBLER__
-struct omap_board_data;
-struct omap_uart_port_info;
-extern void omap_serial_init(void);
-extern void omap_serial_board_init(struct omap_uart_port_info *platform_data);
-extern void omap_serial_init_port(struct omap_board_data *bdata,
-                struct omap_uart_port_info *platform_data);
-#endif
-#endif

diff --git a/arch/arm/mach-omap2/serial.h b/arch/arm/mach-omap2/serial.h index 6a6806271fcf..c4014f013df0 100644 --- a/arch/arm/mach-omap2/serial.h +++ b/arch/arm/mach-omap2/serial.h
@@ -1,112 +1 @@
1	/*	#include <mach/serial.h>
2	* arch/arm/plat-omap/include/mach/serial.h
3	*
4	* Copyright (C) 2009 Texas Instruments
5	* Added OMAP4 support- Santosh Shilimkar <santosh.shilimkar@ti.com>
6	*
7	* This program is distributed in the hope that it will be useful,
8	* but WITHOUT ANY WARRANTY; without even the implied warranty of
9	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10	* GNU General Public License for more details.
11	*/
12
13	#ifndef __ASM_ARCH_SERIAL_H
14	#define __ASM_ARCH_SERIAL_H
15
16	#include <linux/init.h>
17
18	/*
19	* Memory entry used for the DEBUG_LL UART configuration, relative to
20	* start of RAM. See also uncompress.h and debug-macro.S.
21	*
22	* Note that using a memory location for storing the UART configuration
23	* has at least two limitations:
24	*
25	* 1. Kernel uncompress code cannot overlap OMAP_UART_INFO as the
26	* uncompress code could then partially overwrite itself
27	* 2. We assume printascii is called at least once before paging_init,
28	* and addruart has a chance to read OMAP_UART_INFO
29	*/
30	#define OMAP_UART_INFO_OFS 0x3ffc
31
32	/* OMAP2 serial ports */
33	#define OMAP2_UART1_BASE 0x4806a000
34	#define OMAP2_UART2_BASE 0x4806c000
35	#define OMAP2_UART3_BASE 0x4806e000
36
37	/* OMAP3 serial ports */
38	#define OMAP3_UART1_BASE OMAP2_UART1_BASE
39	#define OMAP3_UART2_BASE OMAP2_UART2_BASE
40	#define OMAP3_UART3_BASE 0x49020000
41	#define OMAP3_UART4_BASE 0x49042000 /* Only on 36xx */
42	#define OMAP3_UART4_AM35XX_BASE 0x4809E000 /* Only on AM35xx */
43
44	/* OMAP4 serial ports */
45	#define OMAP4_UART1_BASE OMAP2_UART1_BASE
46	#define OMAP4_UART2_BASE OMAP2_UART2_BASE
47	#define OMAP4_UART3_BASE 0x48020000
48	#define OMAP4_UART4_BASE 0x4806e000
49
50	/* TI81XX serial ports */
51	#define TI81XX_UART1_BASE 0x48020000
52	#define TI81XX_UART2_BASE 0x48022000
53	#define TI81XX_UART3_BASE 0x48024000
54
55	/* AM3505/3517 UART4 */
56	#define AM35XX_UART4_BASE 0x4809E000 /* Only on AM3505/3517 */
57
58	/* AM33XX serial port */
59	#define AM33XX_UART1_BASE 0x44E09000
60
61	/* OMAP5 serial ports */
62	#define OMAP5_UART1_BASE OMAP2_UART1_BASE
63	#define OMAP5_UART2_BASE OMAP2_UART2_BASE
64	#define OMAP5_UART3_BASE OMAP4_UART3_BASE
65	#define OMAP5_UART4_BASE OMAP4_UART4_BASE
66	#define OMAP5_UART5_BASE 0x48066000
67	#define OMAP5_UART6_BASE 0x48068000
68
69	/* External port on Zoom2/3 */
70	#define ZOOM_UART_BASE 0x10000000
71	#define ZOOM_UART_VIRT 0xfa400000
72
73	#define OMAP_PORT_SHIFT 2
74	#define ZOOM_PORT_SHIFT 1
75
76	#define OMAP24XX_BASE_BAUD (48000000/16)
77
78	/*
79	* DEBUG_LL port encoding stored into the UART1 scratchpad register by
80	* decomp_setup in uncompress.h
81	*/
82	#define OMAP2UART1 21
83	#define OMAP2UART2 22
84	#define OMAP2UART3 23
85	#define OMAP3UART1 OMAP2UART1
86	#define OMAP3UART2 OMAP2UART2
87	#define OMAP3UART3 33
88	#define OMAP3UART4 34 /* Only on 36xx */
89	#define OMAP4UART1 OMAP2UART1
90	#define OMAP4UART2 OMAP2UART2
91	#define OMAP4UART3 43
92	#define OMAP4UART4 44
93	#define TI81XXUART1 81
94	#define TI81XXUART2 82
95	#define TI81XXUART3 83
96	#define AM33XXUART1 84
97	#define OMAP5UART3 OMAP4UART3
98	#define OMAP5UART4 OMAP4UART4
99	#define ZOOM_UART 95 /* Only on zoom2/3 */
100
101	#ifndef __ASSEMBLER__
102
103	struct omap_board_data;
104	struct omap_uart_port_info;
105
106	extern void omap_serial_init(void);
107	extern void omap_serial_board_init(struct omap_uart_port_info *platform_data);
108	extern void omap_serial_init_port(struct omap_board_data *bdata,
109	struct omap_uart_port_info *platform_data);
110	#endif
111
112	#endif