Commit 6d9230ed authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: omap2: remove include/mach/ subdirectory 



mach/serial.h is only included from arch/arm/mach-omap2/serial.h,
and the other two files are unused and empty.

Remove the directory by relocating the contents of mach/serial.h
and dropping all other references.

Reviewed-by: default avatarTony Lindgren <tony@atomide.com>
Tested-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 0e7add1e

arch/arm/mach-omap2/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -3,9 +3,6 @@ 
# Makefile for the linux kernel.

#



ccflags-y := -I$(srctree)/$(src)/include \

	-I$(srctree)/arch/arm/plat-omap/include



# Common support

obj-y := id.o io.o control.o devices.o fb.o pm.o \

	 common.o dma.o omap-headsmp.o sram.o

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

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-omap2/include/mach/hardware.h

 */

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

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-omap2/include/mach/irqs.h

 */

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

deleted100644 → 0
+0 −66
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.

 */



/* 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)



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

+66 −1
Original line number Diff line number Diff line 
#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.

 */



/* 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)



#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