diff options
Diffstat (limited to 'target/linux/mvebu/patches-3.10/0060-ARM-kirkwood-Split-DT-and-legacy-MBus-initialization.patch')
-rw-r--r-- | target/linux/mvebu/patches-3.10/0060-ARM-kirkwood-Split-DT-and-legacy-MBus-initialization.patch | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/target/linux/mvebu/patches-3.10/0060-ARM-kirkwood-Split-DT-and-legacy-MBus-initialization.patch b/target/linux/mvebu/patches-3.10/0060-ARM-kirkwood-Split-DT-and-legacy-MBus-initialization.patch deleted file mode 100644 index 7ab5be59d4..0000000000 --- a/target/linux/mvebu/patches-3.10/0060-ARM-kirkwood-Split-DT-and-legacy-MBus-initialization.patch +++ /dev/null @@ -1,52 +0,0 @@ -From d1989c73eb770891635cc644f091d7524bbfd696 Mon Sep 17 00:00:00 2001 -From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> -Date: Tue, 23 Jul 2013 07:42:09 -0300 -Subject: [PATCH 060/203] 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> ---- - arch/arm/mach-kirkwood/board-dt.c | 1 + - arch/arm/mach-kirkwood/common.c | 8 ++++---- - 2 files changed, 5 insertions(+), 4 deletions(-) - ---- a/arch/arm/mach-kirkwood/board-dt.c -+++ b/arch/arm/mach-kirkwood/board-dt.c -@@ -93,6 +93,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(); ---- a/arch/arm/mach-kirkwood/common.c -+++ b/arch/arm/mach-kirkwood/common.c -@@ -527,10 +527,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; -@@ -703,6 +699,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(); |