leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Tony Lindgren 2012-10-15 12:50:46 -07:00
parent ede8df1eaa
commit 3d82cbbb3a
17 changed files with 64 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap1/include/mach/debug-macro.S
View File

@ -13,7 +13,7 @@
#include <linux/serial_reg.h>
#include <plat/serial.h>
#include "serial.h"
.pushsection .data
omap_uart_phys: .word 0x0

2
arch/arm/mach-omap1/include/mach/hardware.h
View File

@ -72,7 +72,7 @@ static inline u32 omap_cs3_phys(void)
#endif /* ifndef __ASSEMBLER__ */
#include <plat/serial.h>
#include <mach/serial.h>
/*
* ---------------------------------------------------------------------------

53
arch/arm/mach-omap1/include/mach/serial.h Normal file
View File

@ -0,0 +1,53 @@
/*
* 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

2
arch/arm/mach-omap1/include/mach/uncompress.h
View File

@ -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

1
arch/arm/mach-omap2/board-rm680.c
View File

@ -25,7 +25,6 @@
#include <plat/usb.h>
#include "gpmc.h"
#include "common.h"
#include <plat/serial.h>
#include "mux.h"
#include "mmc.h"

3
arch/arm/mach-omap2/common.h
View File

@ -34,11 +34,10 @@
#include <asm/proc-fns.h>
#include <plat/serial.h>
#include "../plat-omap/common.h"
#include "i2c.h"
#include "serial.h"
#define OMAP_INTC_START NR_IRQS

2
arch/arm/mach-omap2/include/mach/debug-macro.S
View File

@ -13,7 +13,7 @@
#include <linux/serial_reg.h>
#include <plat/serial.h>
#include <../mach-omap2/serial.h>
#define UART_OFFSET(addr) ((addr) & 0x00ffffff)

2
arch/arm/mach-omap2/include/mach/uncompress.h
View File

@ -23,7 +23,7 @@
#include <asm/memory.h>
#include <asm/mach-types.h>
#include <plat/serial.h>
#include <../mach-omap2/serial.h>
#define MDR1_MODE_MASK 0x07

2
arch/arm/mach-omap2/io.c
View File

@ -25,7 +25,6 @@
#include <asm/tlb.h>
#include <asm/mach/map.h>
#include <plat/serial.h>
#include <plat-omap/dma-omap.h>
#include "../plat-omap/sram.h"
@ -43,6 +42,7 @@
#include "clock44xx.h"
#include "omap-pm.h"
#include "sdrc.h"
#include "serial.h"
/*
* The machine specific code may provide the extra mapping besides the

1
arch/arm/mach-omap2/omap_hwmod_2420_data.c
View File

@ -29,6 +29,7 @@
#include "prm-regbits-24xx.h"
#include "i2c.h"
#include "mmc.h"
#include "serial.h"
#include "wd_timer.h"
/*

2
arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_interconnect_data.c
View File

@ -13,8 +13,6 @@
*/
#include <asm/sizes.h>
#include <plat/serial.h>
#include "omap_hwmod.h"
#include "omap_hwmod_common_data.h"

1
arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
View File

@ -10,7 +10,6 @@
* published by the Free Software Foundation.
*/
#include <plat/serial.h>
#include <plat-omap/dma-omap.h>
#include "../plat-omap/common.h"

3
arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c
View File

@ -13,11 +13,10 @@
*/
#include <asm/sizes.h>
#include <plat/serial.h>
#include "omap_hwmod.h"
#include "l3_2xxx.h"
#include "l4_2xxx.h"
#include "serial.h"
#include "omap_hwmod_common_data.h"

1
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
View File

@ -9,7 +9,6 @@
* published by the Free Software Foundation.
*/
#include <plat/serial.h>
#include <linux/platform_data/gpio-omap.h>
#include <plat-omap/dma-omap.h>
#include <plat/dmtimer.h>

3
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
View File

@ -20,8 +20,6 @@
#include <linux/platform_data/gpio-omap.h>
#include <plat-omap/dma-omap.h>
#include <plat/serial.h>
#include "l3_3xxx.h"
#include "l4_3xxx.h"
#include <linux/platform_data/asoc-ti-mcbsp.h>
@ -41,6 +39,7 @@
#include "i2c.h"
#include "mmc.h"
#include "wd_timer.h"
#include "serial.h"
/*
* OMAP3xxx hardware module integration data

2
arch/arm/mach-omap2/serial.c
View File

@ -29,7 +29,6 @@
#include <plat/omap-serial.h>
#include <plat-omap/dma-omap.h>
#include <plat/serial.h>
#include "common.h"
#include "omap_hwmod.h"
@ -42,6 +41,7 @@
#include "prm-regbits-34xx.h"
#include "control.h"
#include "mux.h"
#include "serial.h"
/*
* NOTE: By default the serial auto_suspend timeout is disabled as it causes

11
arch/arm/plat-omap/include/plat/serial.h → arch/arm/mach-omap2/serial.h
View File

@ -29,11 +29,6 @@
*/
#define OMAP_UART_INFO_OFS 0x3ffc
/* OMAP1 serial ports */
#define OMAP1_UART1_BASE 0xfffb0000
#define OMAP1_UART2_BASE 0xfffb0800
#define OMAP1_UART3_BASE 0xfffb9800
/* OMAP2 serial ports */
#define OMAP2_UART1_BASE 0x4806a000
#define OMAP2_UART2_BASE 0x4806c000
@ -76,20 +71,14 @@
#define ZOOM_UART_VIRT 0xfa400000
#define OMAP_PORT_SHIFT 2
#define OMAP7XX_PORT_SHIFT 0
#define ZOOM_PORT_SHIFT 1
#define OMAP1510_BASE_BAUD (12000000/16)
#define OMAP16XX_BASE_BAUD (48000000/16)
#define OMAP24XX_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
#define OMAP2UART1 21
#define OMAP2UART2 22
#define OMAP2UART3 23