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

Commit 233fd64e authored by Santosh Shilimkar's avatar Santosh Shilimkar Committed by Tony Lindgren
Browse files

omap: Split OMAP2_IO_ADDRESS to L3 and L4 



This patch splits OMAP2_IO_ADDRESS to OMAP2_L3_IO_ADDRESS and
OMAP2_L4_IO_ADDRESS to reclaim more IO space.

The omap_read*() and omap_write*() functions will work only over
L4 address space. Current omap kernel stack uses these functions
only to access registers over L4 io address space

Note that these macros should only be used when ioremap does
not work. Please use ioremap instead in all new code.

Signed-off-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent b0002e0e

arch/arm/mach-omap2/cm.h

+3 −3
Original line number Diff line number Diff line
@@ -17,11 +17,11 @@ 
#include "prcm-common.h"



#define OMAP2420_CM_REGADDR(module, reg)				\

			OMAP2_IO_ADDRESS(OMAP2420_CM_BASE + (module) + (reg))

			OMAP2_L4_IO_ADDRESS(OMAP2420_CM_BASE + (module) + (reg))

#define OMAP2430_CM_REGADDR(module, reg)				\

			OMAP2_IO_ADDRESS(OMAP2430_CM_BASE + (module) + (reg))

			OMAP2_L4_IO_ADDRESS(OMAP2430_CM_BASE + (module) + (reg))

#define OMAP34XX_CM_REGADDR(module, reg)				\

			OMAP2_IO_ADDRESS(OMAP3430_CM_BASE + (module) + (reg))

			OMAP2_L4_IO_ADDRESS(OMAP3430_CM_BASE + (module) + (reg))



/*

 * Architecture-specific global CM registers

arch/arm/mach-omap2/pm-debug.c

+2 −1
Original line number Diff line number Diff line
@@ -51,7 +51,8 @@ int omap2_pm_debug; 
	regs[reg_count++].val = __raw_readl(reg)

#define DUMP_INTC_REG(reg, off) \

	regs[reg_count].name = #reg; \

	regs[reg_count++].val = __raw_readl(OMAP2_IO_ADDRESS(0x480fe000 + (off)))

	regs[reg_count++].val = \

			 __raw_readl(OMAP2_L4_IO_ADDRESS(0x480fe000 + (off)))



static int __init pm_dbg_init(void);

arch/arm/mach-omap2/prm.h

+3 −3
Original line number Diff line number Diff line
@@ -17,11 +17,11 @@ 
#include "prcm-common.h"



#define OMAP2420_PRM_REGADDR(module, reg)				\

			OMAP2_IO_ADDRESS(OMAP2420_PRM_BASE + (module) + (reg))

		OMAP2_L4_IO_ADDRESS(OMAP2420_PRM_BASE + (module) + (reg))

#define OMAP2430_PRM_REGADDR(module, reg)				\

			OMAP2_IO_ADDRESS(OMAP2430_PRM_BASE + (module) + (reg))

		OMAP2_L4_IO_ADDRESS(OMAP2430_PRM_BASE + (module) + (reg))

#define OMAP34XX_PRM_REGADDR(module, reg)				\

			OMAP2_IO_ADDRESS(OMAP3430_PRM_BASE + (module) + (reg))

		OMAP2_L4_IO_ADDRESS(OMAP3430_PRM_BASE + (module) + (reg))



/*

 * Architecture-specific global PRM registers

arch/arm/mach-omap2/sdrc.h

+6 −3
Original line number Diff line number Diff line
@@ -48,9 +48,12 @@ static inline u32 sms_read_reg(u16 reg) 
	return __raw_readl(OMAP_SMS_REGADDR(reg));

}

#else

#define OMAP242X_SDRC_REGADDR(reg)	OMAP2_IO_ADDRESS(OMAP2420_SDRC_BASE + (reg))

#define OMAP243X_SDRC_REGADDR(reg)	OMAP2_IO_ADDRESS(OMAP243X_SDRC_BASE + (reg))

#define OMAP34XX_SDRC_REGADDR(reg)	OMAP2_IO_ADDRESS(OMAP343X_SDRC_BASE + (reg))

#define OMAP242X_SDRC_REGADDR(reg)					\

			OMAP2_L3_IO_ADDRESS(OMAP2420_SDRC_BASE + (reg))

#define OMAP243X_SDRC_REGADDR(reg)					\

			OMAP2_L3_IO_ADDRESS(OMAP243X_SDRC_BASE + (reg))

#define OMAP34XX_SDRC_REGADDR(reg)					\

			OMAP2_L3_IO_ADDRESS(OMAP343X_SDRC_BASE + (reg))

#endif	/* __ASSEMBLER__ */



#endif

arch/arm/mach-omap2/sram242x.S

+2 −2
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ omap242x_sdi_prcm_voltctrl: 
prcm_mask_val:

	.word 0xFFFF3FFC

omap242x_sdi_timer_32ksynct_cr:

	.word OMAP2_IO_ADDRESS(OMAP2420_32KSYNCT_BASE + 0x010)

	.word OMAP2_L4_IO_ADDRESS(OMAP2420_32KSYNCT_BASE + 0x010)

ENTRY(omap242x_sram_ddr_init_sz)

	.word	. - omap242x_sram_ddr_init
@@ -224,7 +224,7 @@ omap242x_srs_prcm_voltctrl: 
ddr_prcm_mask_val:

	.word 0xFFFF3FFC

omap242x_srs_timer_32ksynct:

	.word OMAP2_IO_ADDRESS(OMAP2420_32KSYNCT_BASE + 0x010)

	.word OMAP2_L4_IO_ADDRESS(OMAP2420_32KSYNCT_BASE + 0x010)



ENTRY(omap242x_sram_reprogram_sdrc_sz)

	.word	. - omap242x_sram_reprogram_sdrc