1 From d1989c73eb770891635cc644f091d7524bbfd696 Mon Sep 17 00:00:00 2001
2 From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
3 Date: Tue, 23 Jul 2013 07:42:09 -0300
4 Subject: [PATCH 060/203] ARM: kirkwood: Split DT and legacy MBus
7 This commit replaces the legacy MBus initialization with the new
8 DT-based in Kirkwood. For boards that are not yet converted to DT,
9 we keep the legacy initialization.
11 Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
12 Tested-by: Andrew Lunn <andrew@lunn.ch>
13 Tested-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
15 arch/arm/mach-kirkwood/board-dt.c | 1 +
16 arch/arm/mach-kirkwood/common.c | 8 ++++----
17 2 files changed, 5 insertions(+), 4 deletions(-)
19 --- a/arch/arm/mach-kirkwood/board-dt.c
20 +++ b/arch/arm/mach-kirkwood/board-dt.c
21 @@ -93,6 +93,7 @@ static void __init kirkwood_dt_init(void
23 writel(readl(CPU_CONFIG) & ~CPU_CONFIG_ERROR_PROP, CPU_CONFIG);
25 + BUG_ON(mvebu_mbus_dt_init());
26 kirkwood_setup_wins();
29 --- a/arch/arm/mach-kirkwood/common.c
30 +++ b/arch/arm/mach-kirkwood/common.c
31 @@ -527,10 +527,6 @@ void __init kirkwood_cpuidle_init(void)
32 void __init kirkwood_init_early(void)
34 orion_time_set_base(TIMER_VIRT_BASE);
36 - mvebu_mbus_init("marvell,kirkwood-mbus",
37 - BRIDGE_WINS_BASE, BRIDGE_WINS_SZ,
38 - DDR_WINDOW_CPU_BASE, DDR_WINDOW_CPU_SZ);
42 @@ -703,6 +699,10 @@ void __init kirkwood_init(void)
44 writel(readl(CPU_CONFIG) & ~CPU_CONFIG_ERROR_PROP, CPU_CONFIG);
46 + BUG_ON(mvebu_mbus_init("marvell,kirkwood-mbus",
47 + BRIDGE_WINS_BASE, BRIDGE_WINS_SZ,
48 + DDR_WINDOW_CPU_BASE, DDR_WINDOW_CPU_SZ));
50 kirkwood_setup_wins();