Commit 94113260 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

OMAP: Remove OMAP_IO_ADDRESS, use OMAP1_IO_ADDRESS and OMAP2_IO_ADDRESS instead 



Search and replace OMAP_IO_ADDRESS with OMAP1_IO_ADDRESS and OMAP2_IO_ADDRESS,
and convert omap_read/write into a functions instead of a macros.

Also rename OMAP_MPUIO_VBASE to OMAP1_MPUIO_VBASE.

In the long run, most code should use ioremap + __raw_read/write instead.

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

arch/arm/mach-omap1/devices.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static inline void omap_init_rtc(void) {} 
#  define INT_DSP_MAILBOX1	INT_1610_DSP_MAILBOX1

#endif



#define OMAP1_MBOX_BASE		IO_ADDRESS(OMAP16XX_MAILBOX_BASE)

#define OMAP1_MBOX_BASE		OMAP1_IO_ADDRESS(OMAP16XX_MAILBOX_BASE)



static struct resource mbox_resources[] = {

	{

arch/arm/mach-omap1/pm.h

+2 −2
Original line number Diff line number Diff line
@@ -39,11 +39,11 @@ 
 * Register and offset definitions to be used in PM assembler code

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

 */

#define CLKGEN_REG_ASM_BASE		IO_ADDRESS(0xfffece00)

#define CLKGEN_REG_ASM_BASE		OMAP1_IO_ADDRESS(0xfffece00)

#define ARM_IDLECT1_ASM_OFFSET		0x04

#define ARM_IDLECT2_ASM_OFFSET		0x08



#define TCMIF_ASM_BASE			IO_ADDRESS(0xfffecc00)

#define TCMIF_ASM_BASE			OMAP1_IO_ADDRESS(0xfffecc00)

#define EMIFS_CONFIG_ASM_OFFSET		0x0c

#define EMIFF_SDRAM_CONFIG_ASM_OFFSET	0x20

arch/arm/mach-omap1/serial.c

+3 −3
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static void __init omap_serial_reset(struct plat_serial8250_port *p) 


static struct plat_serial8250_port serial_platform_data[] = {

	{

		.membase	= IO_ADDRESS(OMAP_UART1_BASE),

		.membase	= OMAP1_IO_ADDRESS(OMAP_UART1_BASE),

		.mapbase	= OMAP_UART1_BASE,

		.irq		= INT_UART1,

		.flags		= UPF_BOOT_AUTOCONF,
@@ -73,7 +73,7 @@ static struct plat_serial8250_port serial_platform_data[] = { 
		.uartclk	= OMAP16XX_BASE_BAUD * 16,

	},

	{

		.membase	= IO_ADDRESS(OMAP_UART2_BASE),

		.membase	= OMAP1_IO_ADDRESS(OMAP_UART2_BASE),

		.mapbase	= OMAP_UART2_BASE,

		.irq		= INT_UART2,

		.flags		= UPF_BOOT_AUTOCONF,
@@ -82,7 +82,7 @@ static struct plat_serial8250_port serial_platform_data[] = { 
		.uartclk	= OMAP16XX_BASE_BAUD * 16,

	},

	{

		.membase	= IO_ADDRESS(OMAP_UART3_BASE),

		.membase	= OMAP1_IO_ADDRESS(OMAP_UART3_BASE),

		.mapbase	= OMAP_UART3_BASE,

		.irq		= INT_UART3,

		.flags		= UPF_BOOT_AUTOCONF,

arch/arm/mach-omap1/sram.S

+6 −6
Original line number Diff line number Diff line
@@ -21,13 +21,13 @@ 
ENTRY(omap1_sram_reprogram_clock)

	stmfd	sp!, {r0 - r12, lr}		@ save registers on stack



	mov	r2, #IO_ADDRESS(DPLL_CTL) & 0xff000000

	orr	r2, r2, #IO_ADDRESS(DPLL_CTL) & 0x00ff0000

	orr	r2, r2, #IO_ADDRESS(DPLL_CTL) & 0x0000ff00

	mov	r2, #OMAP1_IO_ADDRESS(DPLL_CTL) & 0xff000000

	orr	r2, r2, #OMAP1_IO_ADDRESS(DPLL_CTL) & 0x00ff0000

	orr	r2, r2, #OMAP1_IO_ADDRESS(DPLL_CTL) & 0x0000ff00



	mov	r3, #IO_ADDRESS(ARM_CKCTL) & 0xff000000

	orr	r3, r3, #IO_ADDRESS(ARM_CKCTL) & 0x00ff0000

	orr	r3, r3, #IO_ADDRESS(ARM_CKCTL) & 0x0000ff00

	mov	r3, #OMAP1_IO_ADDRESS(ARM_CKCTL) & 0xff000000

	orr	r3, r3, #OMAP1_IO_ADDRESS(ARM_CKCTL) & 0x00ff0000

	orr	r3, r3, #OMAP1_IO_ADDRESS(ARM_CKCTL) & 0x0000ff00



	tst	r0, #1 << 4			@ want lock mode?

	beq	newck				@ nope

arch/arm/mach-omap1/time.c

+2 −2
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ typedef struct { 
} omap_mpu_timer_regs_t;



#define omap_mpu_timer_base(n)							\

((volatile omap_mpu_timer_regs_t*)IO_ADDRESS(OMAP_MPU_TIMER_BASE +	\

((volatile omap_mpu_timer_regs_t*)OMAP1_IO_ADDRESS(OMAP_MPU_TIMER_BASE +	\

				 (n)*OMAP_MPU_TIMER_OFFSET))



static inline unsigned long omap_mpu_timer_read(int nr)

CRA Git | Maintained and supported by SUSTech CRA and CCSE