diff options
Diffstat (limited to 'arch/arm/plat-omap/sram.c')
| -rw-r--r-- | arch/arm/plat-omap/sram.c | 62 |
1 files changed, 5 insertions, 57 deletions
diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c index ba0693d7dcaa..dbe2f4dab6b4 100644 --- a/arch/arm/plat-omap/sram.c +++ b/arch/arm/plat-omap/sram.c @@ -39,33 +39,12 @@ #define OMAP1_SRAM_PA 0x20000000 #define OMAP2_SRAM_PUB_PA (OMAP2_SRAM_PA + 0xf800) #define OMAP3_SRAM_PUB_PA (OMAP3_SRAM_PA + 0x8000) - #ifdef CONFIG_OMAP4_ERRATA_I688 #define OMAP4_SRAM_PUB_PA OMAP4_SRAM_PA #else #define OMAP4_SRAM_PUB_PA (OMAP4_SRAM_PA + 0x4000) #endif - -#define OMAP3_SRAM_PUB_VA (OMAP3_SRAM_VA + 0x8000) - -#define OMAP4_SRAM_MAX 0xe000 /* 56K */ -#define OMAP4_SRAM_VA 0xfe400000 -#define OMAP4_HS_SRAM_SIZE 0x1000 /* 4K */ -#define OMAP4_HS_SRAM_OFFSET (OMAP4_SRAM_MAX - OMAP4_HS_SRAM_SIZE) -#define OMAP4_SRAM_PUB_PA (OMAP4_SRAM_PA + OMAP4_HS_SRAM_OFFSET) -#define OMAP4_SRAM_PUB_VA (OMAP4_SRAM_VA + OMAP4_HS_SRAM_OFFSET) - -/* Reserve 60K bytes of SRAM for HS/EMU devices */ -#define OMAP5_SRAM_RESERVED_SIZE 0xF000 ->>>>>>> patched -#define OMAP5_SRAM_PA 0x40300000 -#define OMAP5_SRAM_VA 0xfe400000 -/* - * Allocate the upper SRAM space for the kernel, and reserve the - * lower space for HS/EMU devices. - */ -#define OMAP5_SRAM_PUB_PA (OMAP5_SRAM_PA + OMAP5_SRAM_RESERVED_SIZE) -#define OMAP5_SRAM_PUB_VA (OMAP5_SRAM_VA + OMAP5_SRAM_RESERVED_SIZE) +#define OMAP5_SRAM_PUB_PA OMAP5_SRAM_PA #if defined(CONFIG_ARCH_OMAP2PLUS) #define SRAM_BOOTLOADER_SZ 0x00 @@ -139,12 +118,10 @@ static void __init omap_detect_sram(void) } } else if (cpu_is_omap44xx()) { omap_sram_start = OMAP4_SRAM_PUB_PA; - omap_sram_size = OMAP4_HS_SRAM_SIZE; /* 4K */ + omap_sram_size = 0xa000; /* 40K */ } else if (cpu_is_omap54xx()) { - omap_sram_base = OMAP5_SRAM_PUB_VA; omap_sram_start = OMAP5_SRAM_PUB_PA; omap_sram_size = SZ_128K; /* 128KB */ - omap_sram_size -= OMAP5_SRAM_RESERVED_SIZE; } else { omap_sram_start = OMAP2_SRAM_PUB_PA; omap_sram_size = 0x800; /* 2K */ @@ -158,12 +135,10 @@ static void __init omap_detect_sram(void) omap_sram_size = 0x10000; /* 64K */ } else if (cpu_is_omap44xx()) { omap_sram_start = OMAP4_SRAM_PA; - omap_sram_size = OMAP4_HS_SRAM_SIZE; /* 4K */ + omap_sram_size = 0xe000; /* 56K */ } else if (cpu_is_omap54xx()) { - omap_sram_base = OMAP5_SRAM_VA; omap_sram_start = OMAP5_SRAM_PA; omap_sram_size = SZ_128K; /* 128KB */ - omap_sram_size -= OMAP5_SRAM_RESERVED_SIZE; } else { omap_sram_start = OMAP2_SRAM_PA; if (cpu_is_omap242x()) @@ -212,32 +187,6 @@ static void __init omap_map_sram(void) * which will cause the system to hang. */ cached = 0; - omap_sram_io_desc[0].type = MT_MEMORY_NONCACHED; - } else if (cpu_is_omap44xx()) { - /* - * Map a page of SRAM with strongly ordered attributes - * for interconnect barrier usage. - * if we have space, then use a new page, else remap - * first map - */ - if (omap_sram_size <= PAGE_SIZE) { - omap_sram_io_desc[0].type = MT_MEMORY_SO; - sram_sync = - (void __iomem *) omap_sram_io_desc[0].virtual; - } else { - omap_sram_io_desc[0].length = ROUND_DOWN(omap_sram_size - - PAGE_SIZE, PAGE_SIZE); - omap_sram_io_desc[1].virtual = - omap_sram_base + omap_sram_io_desc[0].length; - base = omap_sram_start + omap_sram_io_desc[0].length; - base = ROUND_DOWN(base, PAGE_SIZE); - omap_sram_io_desc[1].pfn = __phys_to_pfn(base); - omap_sram_io_desc[1].length = PAGE_SIZE; - omap_sram_io_desc[1].type = MT_MEMORY_SO; - nr_desc = 2; - sram_sync = - (void __iomem *) omap_sram_io_desc[1].virtual; - } } omap_sram_start = ROUND_DOWN(omap_sram_start, PAGE_SIZE); @@ -435,9 +384,8 @@ static inline int am33xx_sram_init(void) int __init omap_sram_init(void) { - if (!cpu_is_omap54xx()) - omap_detect_sram(); - omap_map_sram(); + omap_detect_sram(); + omap_map_sram(); if (!(cpu_class_is_omap2())) omap1_sram_init(); |