diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2013-03-29 14:41:27 +0800 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2013-04-04 21:15:57 +0800 |
| commit | 45680995cd8ccf5eb71a1808eb96408589d37a26 (patch) | |
| tree | 0ad2b5c89a2a4138de4f2538180833491f8d8f06 /arch/arm/mach-mxs/mach-mxs.c | |
| parent | e933a1a12a02f42e0013cda87bba37ccb59efc47 (diff) | |
| download | lwn-45680995cd8ccf5eb71a1808eb96408589d37a26.tar.gz lwn-45680995cd8ccf5eb71a1808eb96408589d37a26.zip | |
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.c | 3 |
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 @@ #include <asm/mach/time.h> #include <asm/system_misc.h> +#include "pm.h" + /* MXS DIGCTL SAIF CLKMUX */ #define MXS_DIGCTL_SAIF_CLKMUX_DIRECT 0x0 #define MXS_DIGCTL_SAIF_CLKMUX_CROSSINPUT 0x1 @@ -607,6 +609,7 @@ DT_MACHINE_START(MXS, "Freescale MXS (Device Tree)") .handle_irq = icoll_handle_irq, .init_time = mxs_timer_init, .init_machine = mxs_machine_init, + .init_late = mxs_pm_init, .dt_compat = mxs_dt_compat, .restart = mxs_restart, MACHINE_END |