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

Commit 88995e80 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

PM / shmobile: Fix build of sh7372_pm_init() for CONFIG_PM unset 



Fix build regression introduced by commit 056879d2
(ARM: mach-shmobile: sh7372 A3SP no_suspend_console fix) by moving
the intialization of the A3SP domain to a separate function and
providing an empty definition of it for CONFIG_PM unset.

Reported-and-tested-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent 8b258cc8

arch/arm/mach-shmobile/pm-sh7372.c

+14 −5
Original line number Diff line number Diff line
@@ -232,11 +232,23 @@ struct sh7372_pm_domain sh7372_a3sp = { 
	.no_debug = true,

};



static void sh7372_a3sp_init(void)

{

	/* serial consoles make use of SCIF hardware located in A3SP,

	 * keep such power domain on if "no_console_suspend" is set.

	 */

	sh7372_a3sp.stay_on = !console_suspend_enabled;

}



struct sh7372_pm_domain sh7372_a3sg = {

	.bit_shift = 13,

};



#endif /* CONFIG_PM */

#else /* !CONFIG_PM */



static inline void sh7372_a3sp_init(void) {}



#endif /* !CONFIG_PM */



#if defined(CONFIG_SUSPEND) || defined(CONFIG_CPU_IDLE)

static int sh7372_do_idle_core_standby(unsigned long unused)
@@ -474,10 +486,7 @@ void __init sh7372_pm_init(void) 
	/* do not convert A3SM, A3SP, A3SG, A4R power down into A4S */

	__raw_writel(0, PDNSEL);



	/* serial consoles make use of SCIF hardware located in A3SP,

	 * keep such power domain on if "no_console_suspend" is set.

	 */

	sh7372_a3sp.stay_on = !console_suspend_enabled;

	sh7372_a3sp_init();



	sh7372_suspend_init();

	sh7372_cpuidle_init();