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

Commit 8a424bb3 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP2/3: Move define of OMAP2_VA_IC_BASE to be local to entry-macro.S 



Move define of OMAP2_VA_IC_BASE to be local to entry-macro.S

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

arch/arm/plat-omap/include/mach/entry-macro.S

+6 −3
Original line number Diff line number Diff line
@@ -58,11 +58,14 @@ 
#endif

#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)



#if defined(CONFIG_ARCH_OMAP24XX)

#include <mach/omap24xx.h>

#endif

#if defined(CONFIG_ARCH_OMAP34XX)

#include <mach/omap34xx.h>



/* REVISIT: This should be set dynamically if CONFIG_MULTI_OMAP2 is selected */

#if defined(CONFIG_ARCH_OMAP2420) || defined(CONFIG_ARCH_OMAP2430)

#define OMAP2_VA_IC_BASE		IO_ADDRESS(OMAP24XX_IC_BASE)

#elif defined(CONFIG_ARCH_OMAP34XX)

#define OMAP2_VA_IC_BASE		IO_ADDRESS(OMAP34XX_IC_BASE)

#endif



#define INTCPS_SIR_IRQ_OFFSET	0x0040		/* Active interrupt offset */

arch/arm/plat-omap/include/mach/omap24xx.h

+0 −2
Original line number Diff line number Diff line
@@ -89,13 +89,11 @@ 


#define OMAP2_PRCM_BASE		OMAP2420_PRCM_BASE

#define OMAP2_CM_BASE		OMAP2420_CM_BASE

#define OMAP2_VA_IC_BASE	IO_ADDRESS(OMAP24XX_IC_BASE)



#elif defined(CONFIG_ARCH_OMAP2430)



#define OMAP2_PRCM_BASE		OMAP2430_PRCM_BASE

#define OMAP2_CM_BASE		OMAP2430_CM_BASE

#define OMAP2_VA_IC_BASE	IO_ADDRESS(OMAP24XX_IC_BASE)



#endif

arch/arm/plat-omap/include/mach/omap34xx.h

+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ 
#if defined(CONFIG_ARCH_OMAP3430)



#define OMAP2_CM_BASE			OMAP3430_CM_BASE

#define OMAP2_VA_IC_BASE		IO_ADDRESS(OMAP34XX_IC_BASE)



#endif