summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ux500/cpu.c
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2012-09-25 17:03:45 +0200
committerLee Jones <lee.jones@linaro.org>2012-11-01 12:59:21 +0100
commit0ddf855af6162df41345ea6afabd0190d751bfb9 (patch)
treed8055c3ddf15a6e407fa78f93b7171bf8c35c9bc /arch/arm/mach-ux500/cpu.c
parentARM: ux500: Move regulator-name properties out to board DTS files (diff)
downloadlinux-0ddf855af6162df41345ea6afabd0190d751bfb9.tar.xz
linux-0ddf855af6162df41345ea6afabd0190d751bfb9.zip
ARM: ux500: Fix initialisation order for UIBs
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. Acked-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500/cpu.c')
-rw-r--r--arch/arm/mach-ux500/cpu.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/cpu.c b/arch/arm/mach-ux500/cpu.c
index 1f3fbc2bb776..721e7b4275f3 100644
--- a/arch/arm/mach-ux500/cpu.c
+++ b/arch/arm/mach-ux500/cpu.c
@@ -26,6 +26,8 @@
#include <mach/setup.h>
#include <mach/devices.h>
+#include "board-mop500.h"
+
void __iomem *_PRCMU_BASE;
/*
@@ -82,6 +84,7 @@ void __init ux500_init_irq(void)
void __init ux500_init_late(void)
{
+ mop500_uib_init();
}
static const char * __init ux500_get_machine(void)