diff options
| author | Lennert Buytenhek <buytenh@wantstofly.org> | 2008-08-31 07:39:19 +0200 |
|---|---|---|
| committer | Nicolas Pitre <nico@cam.org> | 2008-09-25 22:27:22 +0200 |
| commit | 2d0c9e735ab8413d3cf29576ab14e07f7aa8eab9 (patch) | |
| tree | e1e0ba6f4f874c1d9988f3bbca77d620dc8ab2bf /arch/arm/mach-kirkwood | |
| parent | [ARM] Kirkwood: remove uart1 init calls for boards that don't expose uart1 (diff) | |
| download | linux-2d0c9e735ab8413d3cf29576ab14e07f7aa8eab9.tar.xz linux-2d0c9e735ab8413d3cf29576ab14e07f7aa8eab9.zip | |
[ARM] Kirkwood: allow configuring mbus window for on-chip sram
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Diffstat (limited to 'arch/arm/mach-kirkwood')
| -rw-r--r-- | arch/arm/mach-kirkwood/addr-map.c | 8 | ||||
| -rw-r--r-- | arch/arm/mach-kirkwood/common.h | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/arch/arm/mach-kirkwood/addr-map.c b/arch/arm/mach-kirkwood/addr-map.c index c79f492072f9..5db4f0bbe5ee 100644 --- a/arch/arm/mach-kirkwood/addr-map.c +++ b/arch/arm/mach-kirkwood/addr-map.c @@ -48,6 +48,7 @@ struct mbus_dram_target_info kirkwood_mbus_dram_info; +static int __initdata win_alloc_count; static int __init cpu_win_can_remap(int win) { @@ -111,6 +112,8 @@ void __init kirkwood_setup_cpu_mbus(void) setup_cpu_win(2, KIRKWOOD_NAND_MEM_PHYS_BASE, KIRKWOOD_NAND_MEM_SIZE, TARGET_DEV_BUS, ATTR_DEV_NAND, -1); + win_alloc_count = 3; + /* * Setup MBUS dram target info. */ @@ -137,3 +140,8 @@ void __init kirkwood_setup_cpu_mbus(void) } kirkwood_mbus_dram_info.num_cs = cs; } + +void __init kirkwood_setup_sram_win(u32 base, u32 size) +{ + setup_cpu_win(win_alloc_count++, base, size, 0x03, 0x00, -1); +} diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h index 02abef1b3219..8fa0f6a27635 100644 --- a/arch/arm/mach-kirkwood/common.h +++ b/arch/arm/mach-kirkwood/common.h @@ -23,10 +23,7 @@ void kirkwood_init_irq(void); extern struct mbus_dram_target_info kirkwood_mbus_dram_info; void kirkwood_setup_cpu_mbus(void); -void kirkwood_setup_pcie_io_win(int window, u32 base, u32 size, - int maj, int min); -void kirkwood_setup_pcie_mem_win(int window, u32 base, u32 size, - int maj, int min); +void kirkwood_setup_sram_win(u32 base, u32 size); void kirkwood_pcie_id(u32 *dev, u32 *rev); |