Commit 2d0c9e73 authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Nicolas Pitre
Browse files

[ARM] Kirkwood: allow configuring mbus window for on-chip sram 



Signed-off-by: default avatarLennert Buytenhek <buytenh@marvell.com>
parent 3a64ebc9

arch/arm/mach-kirkwood/addr-map.c

+8 −0
Original line number Diff line number Diff line
@@ -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);

}

arch/arm/mach-kirkwood/common.h

+1 −4
Original line number Diff line number Diff line
@@ -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);