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

Commit a283580c authored by Rob Herring's avatar Rob Herring Committed by Olof Johansson
Browse files

ARM: highbank: call highbank_pm_init from .init_machine 



Being a module_init call, highbank_pm_init will cause problem with
multi-platform build running on other platforms.  Call it from
.init_machine instead.

Reported-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 85594df2

arch/arm/mach-highbank/core.h

+6 −0
Original line number Diff line number Diff line
@@ -8,4 +8,10 @@ extern void highbank_lluart_map_io(void); 
static inline void highbank_lluart_map_io(void) {}

#endif



#ifdef CONFIG_PM_SLEEP

extern void highbank_pm_init(void);

#else

static inline void highbank_pm_init(void) {}

#endif



extern void highbank_smc1(int fn, int arg);

arch/arm/mach-highbank/highbank.c

+1 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ static void highbank_power_off(void) 
static void __init highbank_init(void)

{

	pm_power_off = highbank_power_off;

	highbank_pm_init();



	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

}

arch/arm/mach-highbank/pm.c

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

};



static int __init highbank_pm_init(void)

void __init highbank_pm_init(void)

{

	suspend_set_ops(&highbank_pm_ops);

	return 0;

}
 
module_init(highbank_pm_init);