ARM: ux500: Fix initialisation order for UIBs

Commit Message

Lee Jones Sept. 25, 2012, 3:10 p.m. UTC

An earlier change prevented User Interface Boards (UIBs) from being
initialised on boards which did not support them. This change had
the undesired effect of reordering the UIB initialisation calls with
I2C registration. Here we ensure UIBs are only setup after all
required infrastructure is already in place.

Signed-off-by: Lee Jones <[e-mail]>
---
 arch/arm/mach-ux500/board-mop500.c |   10 +---------
 arch/arm/mach-ux500/cpu.c          |    2 ++
 2 files changed, 3 insertions(+), 9 deletions(-)

Comments

Arnd Bergmann Sept. 25, 2012, 5:10 p.m. UTC | #1

On Tuesday 25 September 2012, Lee Jones wrote:
> 
> An earlier change prevented User Interface Boards (UIBs) from being
> initialised on boards which did not support them. This change had
> the undesired effect of reordering the UIB initialisation calls with
> I2C registration. Here we ensure UIBs are only setup after all
> required infrastructure is already in place.
> 
> Signed-off-by: Lee Jones <[e-mail]>

Acked-by: Arnd Bergmann <[e-mail]>

Linus Walleij Sept. 26, 2012, 11:35 a.m. UTC | #2

On Tue, Sep 25, 2012 at 5:10 PM, Lee Jones <[e-mail]> wrote:

> An earlier change prevented User Interface Boards (UIBs) from being
> initialised on boards which did not support them. This change had
> the undesired effect of reordering the UIB initialisation calls with
> I2C registration. Here we ensure UIBs are only setup after all
> required infrastructure is already in place.
>
> Signed-off-by: Lee Jones <[e-mail]>

Acked-by: Linus Walleij <[e-mail]>

Yours,
Linus Walleij

Patch

diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 5eb5ea1..4eedf1c 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -639,8 +639,6 @@  static void __init mop500_init_machine(void)
 
 	/* This board has full regulator constraints */
 	regulator_has_full_constraints();
-
-	mop500_uib_init();
 }
 
 static void __init snowball_init_machine(void)
@@ -705,8 +703,6 @@  static void __init hrefv60_init_machine(void)
 
 	/* This board has full regulator constraints */
 	regulator_has_full_constraints();
-
-	mop500_uib_init();
 }
 
 MACHINE_START(U8500, "ST-Ericsson MOP500 platform")
@@ -739,7 +735,7 @@  MACHINE_START(SNOWBALL, "Calao Systems Snowball platform")
 	.timer		= &ux500_timer,
 	.handle_irq	= gic_handle_irq,
 	.init_machine	= snowball_init_machine,
-	.init_late	= ux500_init_late,
+	.init_late	= NULL,
 MACHINE_END
 
 #ifdef CONFIG_MACH_UX500_DT
@@ -829,8 +825,6 @@  static void __init u8500_init_machine(void)
 		i2c_register_board_info(2, mop500_i2c2_devices,
 					ARRAY_SIZE(mop500_i2c2_devices));
 
-		mop500_uib_init();
-
 	} else if (of_machine_is_compatible("st-ericsson,hrefv60+")) {
 		/*
 		 * The HREFv60 board removed a GPIO expander and routed
@@ -840,8 +834,6 @@  static void __init u8500_init_machine(void)
 		mop500_gpio_keys[0].gpio = HREFV60_PROX_SENSE_GPIO;
 		platform_add_devices(mop500_platform_devs,
 				ARRAY_SIZE(mop500_platform_devs));
-
-		mop500_uib_init();
 	}
 
 	/* This board has full regulator constraints */
diff --git a/arch/arm/mach-ux500/cpu.c b/arch/arm/mach-ux500/cpu.c
index e2360e7..ab2ca7d 100644
--- a/arch/arm/mach-ux500/cpu.c
+++ b/arch/arm/mach-ux500/cpu.c
@@ -26,6 +26,7 @@ 
 #include <mach/devices.h>
 
 #include "clock.h"
+#include "board-mop500.h"
 
 void __iomem *_PRCMU_BASE;
 
@@ -77,6 +78,7 @@  void __init ux500_init_late(void)
 {
 	clk_debugfs_init();
 	clk_init_smp_twd_cpufreq();
+	mop500_uib_init();
 }
 
 static const char * __init ux500_get_machine(void)