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

Commit 0789d0b2 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Jason Cooper
Browse files

ARM: kirkwood: Split DT and legacy MBus initialization 



This commit replaces the legacy MBus initialization with the new
DT-based in Kirkwood. For boards that are not yet converted to DT,
we keep the legacy initialization.

Signed-off-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Tested-by: default avatarAndrew Lunn <andrew@lunn.ch>
Tested-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 14fd8ed0

arch/arm/mach-kirkwood/board-dt.c

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ static void __init kirkwood_dt_init(void) 
	 */

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



	BUG_ON(mvebu_mbus_dt_init());

	kirkwood_setup_wins();



	kirkwood_l2_init();

arch/arm/mach-kirkwood/common.c

+4 −4
Original line number Diff line number Diff line
@@ -534,10 +534,6 @@ void __init kirkwood_cpuidle_init(void) 
void __init kirkwood_init_early(void)

{

	orion_time_set_base(TIMER_VIRT_BASE);



	mvebu_mbus_init("marvell,kirkwood-mbus",

			BRIDGE_WINS_BASE, BRIDGE_WINS_SZ,

			DDR_WINDOW_CPU_BASE, DDR_WINDOW_CPU_SZ);

}



int kirkwood_tclk;
@@ -713,6 +709,10 @@ void __init kirkwood_init(void) 
	 */

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



	BUG_ON(mvebu_mbus_init("marvell,kirkwood-mbus",

			BRIDGE_WINS_BASE, BRIDGE_WINS_SZ,

			DDR_WINDOW_CPU_BASE, DDR_WINDOW_CPU_SZ));



	kirkwood_setup_wins();



	kirkwood_l2_init();