Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45680995 authored by Shawn Guo's avatar Shawn Guo
Browse files

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: default avatarShawn Guo <shawn.guo@linaro.org>
parent e933a1a1

arch/arm/mach-mxs/mach-mxs.c

+3 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-mxs/pm.c

+1 −3
Original line number Diff line number Diff line
@@ -34,9 +34,7 @@ static struct platform_suspend_ops mxs_suspend_ops = { 
	.valid = suspend_valid_only_mem,

};



static int __init mxs_pm_init(void)

void __init mxs_pm_init(void)

{

	suspend_set_ops(&mxs_suspend_ops);

	return 0;

}
 
device_initcall(mxs_pm_init);

arch/arm/mach-mxs/pm.h

0 → 100644
+14 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013 Freescale Semiconductor, Inc.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#ifndef __ARCH_MXS_PM_H

#define __ARCH_MXS_PM_H



void mxs_pm_init(void);



#endif