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 /arch/arm/mach-kirkwood/board-dt.c | |
| parent | 14fd8ed0a7fd199131425fe9e802173c4ba6a4e9 (diff) | |
| download | op-kernel-dev-0789d0b2c342bc0fdfe813994668b80fcef5d05a.zip op-kernel-dev-0789d0b2c342bc0fdfe813994668b80fcef5d05a.tar.gz | |
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>
Diffstat (limited to 'arch/arm/mach-kirkwood/board-dt.c')
| -rw-r--r-- | arch/arm/mach-kirkwood/board-dt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c index 6e122ed..682b7ac 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(); |
