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

Commit e12399fe authored by Russell King's avatar Russell King
Browse files

Merge branch 'for-rmk' of git://git.marvell.com/orion

parents 378ce74b 2bf30108

arch/arm/mach-kirkwood/common.c

+8 −0
Original line number Diff line number Diff line
@@ -915,6 +915,14 @@ void __init kirkwood_init(void) 
	kirkwood_uart0_data[0].uartclk = kirkwood_tclk;

	kirkwood_uart1_data[0].uartclk = kirkwood_tclk;



	/*

	 * Disable propagation of mbus errors to the CPU local bus,

	 * as this causes mbus errors (which can occur for example

	 * for PCI aborts) to throw CPU aborts, which we're not set

	 * up to deal with.

	 */

	writel(readl(CPU_CONFIG) & ~CPU_CONFIG_ERROR_PROP, CPU_CONFIG);



	kirkwood_setup_cpu_mbus();



#ifdef CONFIG_CACHE_FEROCEON_L2

arch/arm/mach-kirkwood/include/mach/bridge-regs.h

+3 −0
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ 


#include <mach/kirkwood.h>



#define CPU_CONFIG		(BRIDGE_VIRT_BASE | 0x0100)

#define CPU_CONFIG_ERROR_PROP	0x00000004



#define CPU_CONTROL		(BRIDGE_VIRT_BASE | 0x0104)

#define CPU_RESET		0x00000002