Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d82cbbb authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP: Split plat/serial.h for omap1 and omap2+ 



For omap1, we'll keep mach/serial.h around for 8250.c hardware
workarounds. For omap2+, we no longer need mach/serial.h and
can make it local to mach-omap2.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent ede8df1e

arch/arm/mach-omap1/include/mach/debug-macro.S

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 


#include <linux/serial_reg.h>



#include <plat/serial.h>

#include "serial.h"



		.pushsection .data

omap_uart_phys:	.word	0x0

arch/arm/mach-omap1/include/mach/hardware.h

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static inline u32 omap_cs3_phys(void) 


#endif	/* ifndef __ASSEMBLER__ */



#include <plat/serial.h>

#include <mach/serial.h>



/*

 * ---------------------------------------------------------------------------

arch/arm/mach-omap1/include/mach/serial.h

0 → 100644
+53 −0
Original line number Diff line number Diff line 
/*

 * 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



/* OMAP1 serial ports */

#define OMAP1_UART1_BASE	0xfffb0000

#define OMAP1_UART2_BASE	0xfffb0800

#define OMAP1_UART3_BASE	0xfffb9800



#define OMAP_PORT_SHIFT		2

#define OMAP7XX_PORT_SHIFT	0



#define OMAP1510_BASE_BAUD	(12000000/16)

#define OMAP16XX_BASE_BAUD	(48000000/16)



/*

 * DEBUG_LL port encoding stored into the UART1 scratchpad register by

 * decomp_setup in uncompress.h

 */

#define OMAP1UART1		11

#define OMAP1UART2		12

#define OMAP1UART3		13



#ifndef __ASSEMBLER__

extern void omap_serial_init(void);

#endif



#endif

arch/arm/mach-omap1/include/mach/uncompress.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <asm/memory.h>

#include <asm/mach-types.h>



#include <plat/serial.h>

#include "serial.h"



#define MDR1_MODE_MASK			0x07

arch/arm/mach-omap2/board-rm680.c

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <plat/usb.h>

#include "gpmc.h"

#include "common.h"

#include <plat/serial.h>



#include "mux.h"

#include "mmc.h"