From 421d46751d9515bf9306188d4db163e0e3acbd7d Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Fri, 30 Sep 2005 11:40:00 +0300 Subject: [PATCH] ARM: OMAP: Move omap2 IO defines Move omap2 IO defines --- arch/arm/mach-omap2/prcm.h | 4 ---- arch/arm/mach-omap2/sram-fn.S | 3 ++- include/asm-arm/arch-omap/hardware.h | 8 ++------ include/asm-arm/arch-omap/io.h | 4 ++-- include/asm-arm/arch-omap/omap24xx.h | 17 ++++++++++++++--- 5 files changed, 20 insertions(+), 16 deletions(-) diff --git a/arch/arm/mach-omap2/prcm.h b/arch/arm/mach-omap2/prcm.h index 27c78770681..2eb89b936c8 100644 --- a/arch/arm/mach-omap2/prcm.h +++ b/arch/arm/mach-omap2/prcm.h @@ -21,10 +21,6 @@ #ifndef __ASM_ARM_ARCH_DPM_PRCM_H #define __ASM_ARM_ARCH_DPM_PRCM_H -#define OMAP24XX_32KSYNCT_BASE (L4_24XX_PHYS + 0x4000) -#define OMAP24XX_PRCM_BASE (L4_24XX_PHYS + 0x8000) -#define OMAP24XX_SDRC_BASE (L3_24XX_PHYS + 0x9000) - /* SET_PERFORMANCE_LEVEL PARAMETERS */ #define PRCM_HALF_SPEED 1 #define PRCM_FULL_SPEED 2 diff --git a/arch/arm/mach-omap2/sram-fn.S b/arch/arm/mach-omap2/sram-fn.S index 41352c3ae83..3098b6fdc99 100644 --- a/arch/arm/mach-omap2/sram-fn.S +++ b/arch/arm/mach-omap2/sram-fn.S @@ -26,7 +26,8 @@ #include #include #include - +#include + #include "prcm.h" #define TIMER_32KSYNCT_CR_V IO_ADDRESS(OMAP24XX_32KSYNCT_BASE + 0x010) diff --git a/include/asm-arm/arch-omap/hardware.h b/include/asm-arm/arch-omap/hardware.h index 60201e1dd6a..5406b875c42 100644 --- a/include/asm-arm/arch-omap/hardware.h +++ b/include/asm-arm/arch-omap/hardware.h @@ -267,8 +267,6 @@ #define OMAP_LPG2_LCR (OMAP_LPG2_BASE + 0x00) #define OMAP_LPG2_PMR (OMAP_LPG2_BASE + 0x04) -#ifndef __ASSEMBLER__ - /* * --------------------------------------------------------------------------- * Processor specific defines @@ -277,13 +275,11 @@ #include "omap730.h" #include "omap1510.h" - -#ifdef CONFIG_ARCH_OMAP24XX #include "omap24xx.h" -#endif - #include "omap16xx.h" +#ifndef __ASSEMBLER__ + /* * --------------------------------------------------------------------------- * Board specific defines diff --git a/include/asm-arm/arch-omap/io.h b/include/asm-arm/arch-omap/io.h index 72725c43673..efaa585297a 100644 --- a/include/asm-arm/arch-omap/io.h +++ b/include/asm-arm/arch-omap/io.h @@ -65,10 +65,10 @@ #elif defined(CONFIG_ARCH_OMAP2) /* We map both L3 and L4 on OMAP2 */ -#define L3_24XX_PHYS 0x68000000 +#define L3_24XX_PHYS L3_24XX_BASE /* 0x68000000 */ #define L3_24XX_VIRT 0xf8000000 #define L3_24XX_SIZE SZ_1M /* 44kB of 128MB used, want 1MB sect */ -#define L4_24XX_PHYS 0x48000000 +#define L4_24XX_PHYS L4_24XX_BASE /* 0x48000000 */ #define L4_24XX_VIRT 0xd8000000 #define L4_24XX_SIZE SZ_1M /* 1MB of 128MB used, want 1MB sect */ #define IO_OFFSET 0x90000000 diff --git a/include/asm-arm/arch-omap/omap24xx.h b/include/asm-arm/arch-omap/omap24xx.h index 05a146ca3da..6e59805fa65 100644 --- a/include/asm-arm/arch-omap/omap24xx.h +++ b/include/asm-arm/arch-omap/omap24xx.h @@ -1,13 +1,24 @@ #ifndef __ASM_ARCH_OMAP24XX_H #define __ASM_ARCH_OMAP24XX_H +/* + * Please place only base defines here and put the rest in device + * specific headers. Note also that some of these defines are needed + * for omap1 to compile without adding ifdefs. + */ + +#define L4_24XX_BASE 0x48000000 +#define L3_24XX_BASE 0x68000000 + /* interrupt controller */ -#define OMAP24XX_IC_BASE (L4_24XX_PHYS + 0xfe000) +#define OMAP24XX_IC_BASE (L4_24XX_BASE + 0xfe000) #define VA_IC_BASE IO_ADDRESS(OMAP24XX_IC_BASE) - #define OMAP24XX_IVA_INTC_BASE 0x40000000 - #define IRQ_SIR_IRQ 0x0040 +#define OMAP24XX_32KSYNCT_BASE (L4_24XX_BASE + 0x4000) +#define OMAP24XX_PRCM_BASE (L4_24XX_BASE + 0x8000) +#define OMAP24XX_SDRC_BASE (L3_24XX_BASE + 0x9000) + #endif /* __ASM_ARCH_OMAP24XX_H */ -- 2.41.1