From: Lee Jones <lee.jones@linaro.org>
Date: Fri, 28 Sep 2012 13:20:03 +0000 (+0100)
Subject: ARM: ux500: Stop calling the UIB init function when using Device Tree
X-Git-Tag: v3.8-rc1~138^2~20^2~17
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=74a1c9ab87a98f3e2e5e62cfaf949eab012477af;p=users%2Fjedix%2Flinux-maple.git

ARM: ux500: Stop calling the UIB init function when using Device Tree

As there will be a Device Tree created for the UIBs, there is no
need to call the UIB initiation functions. Each device will be
detailed and registered from the Device Tree instead.

Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---

diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index 25e1e32dbc08..ca792d0643cd 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -345,7 +345,7 @@ DT_MACHINE_START(U8500_DT, "ST-Ericsson U8500 platform (Device Tree Support)")
 	.timer		= &ux500_timer,
 	.handle_irq	= gic_handle_irq,
 	.init_machine	= u8500_init_machine,
-	.init_late	= ux500_init_late,
+	.init_late	= NULL,
 	.dt_compat      = u8500_dt_board_compat,
 MACHINE_END