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

Commit 2c0b495b authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP2+: Fix relative includes for serial.h 

As discussed on linux-arm-kernel, we want to avoid
relative includes for the arch/arm/*omap* code:

http://www.spinics.net/lists/linux-omap/msg80520.html



Fix serial.h by moving it to mach/serial.h.

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

arch/arm/mach-omap2/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 <../mach-omap2/serial.h>

#include <mach/serial.h>



#define UART_OFFSET(addr)	((addr) & 0x00ffffff)

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

0 → 100644
+103 −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.

 */



/*

 * 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

arch/arm/mach-omap2/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 <../mach-omap2/serial.h>

#include <mach/serial.h>



#define MDR1_MODE_MASK			0x07

arch/arm/mach-omap2/serial.h

+1 −112
Original line number Diff line number Diff line 
/*

 * 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
 
#include <mach/serial.h>