aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mxs/mach-mxs.c
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2013-03-29 02:41:27 -0400
committerShawn Guo <shawn.guo@linaro.org>2013-04-04 09:15:57 -0400
commit45680995cd8ccf5eb71a1808eb96408589d37a26 (patch)
tree0ad2b5c89a2a4138de4f2538180833491f8d8f06 /arch/arm/mach-mxs/mach-mxs.c
parente933a1a12a02f42e0013cda87bba37ccb59efc47 (diff)
ARM: mxs: call mxs_pm_init() as a machine_desc hook
The device_initcall is not a friend of multiplatform build. Call mxs_pm_init() as a machine_desc hook instead of device_initcall. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-mxs/mach-mxs.c')
-rw-r--r--arch/arm/mach-mxs/mach-mxs.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
index 16870bf853b8..b5c1bdd3dcdf 100644
--- a/arch/arm/mach-mxs/mach-mxs.c
+++ b/arch/arm/mach-mxs/mach-mxs.c
@@ -32,6 +32,8 @@
32#include <asm/mach/time.h> 32#include <asm/mach/time.h>
33#include <asm/system_misc.h> 33#include <asm/system_misc.h>
34 34
35#include "pm.h"
36
35/* MXS DIGCTL SAIF CLKMUX */ 37/* MXS DIGCTL SAIF CLKMUX */
36#define MXS_DIGCTL_SAIF_CLKMUX_DIRECT 0x0 38#define MXS_DIGCTL_SAIF_CLKMUX_DIRECT 0x0
37#define MXS_DIGCTL_SAIF_CLKMUX_CROSSINPUT 0x1 39#define MXS_DIGCTL_SAIF_CLKMUX_CROSSINPUT 0x1
@@ -607,6 +609,7 @@ DT_MACHINE_START(MXS, "Freescale MXS (Device Tree)")
607 .handle_irq = icoll_handle_irq, 609 .handle_irq = icoll_handle_irq,
608 .init_time = mxs_timer_init, 610 .init_time = mxs_timer_init,
609 .init_machine = mxs_machine_init, 611 .init_machine = mxs_machine_init,
612 .init_late = mxs_pm_init,
610 .dt_compat = mxs_dt_compat, 613 .dt_compat = mxs_dt_compat,
611 .restart = mxs_restart, 614 .restart = mxs_restart,
612MACHINE_END 615MACHINE_END