diff options
| author |   Ezequiel Garcia <ezequiel.garcia@free-electrons.com> | 2013-07-26 10:18:01 -0300 |
|---|---|---|
| committer |   Jason Cooper <jason@lakedaemon.net> | 2013-08-06 14:11:31 +0000 |
| commit | 0789d0b2c342bc0fdfe813994668b80fcef5d05a (patch) | |
| tree | d35844b143d60ae01ea58a2bbf6bc451a277fdc8 | |
| parent | ARM: mvebu: Relocate Armada 370/XP PCIe device tree nodes (diff) | |
| download | linux-dev-0789d0b2c342bc0fdfe813994668b80fcef5d05a.tar.xz linux-dev-0789d0b2c342bc0fdfe813994668b80fcef5d05a.zip | |
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: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Tested-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
| -rw-r--r-- | arch/arm/mach-kirkwood/board-dt.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-kirkwood/common.c | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c index 6e122ed3282f..682b7ac8deb8 100644 --- a/arch/arm/mach-kirkwood/board-dt.c +++ b/arch/arm/mach-kirkwood/board-dt.c @@ -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(); diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c index 165e75146601..15b7e72e890b 100644 --- a/arch/arm/mach-kirkwood/common.c +++ b/arch/arm/mach-kirkwood/common.c @@ -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(); |