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

Commit 10f90ed2 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

OMAP3: PM: Do not build suspend code if SUSPEND is not enabled 



Signed-off-by: default avatarJouni Hogander <jouni.hogander@nokia.com>
Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
parent 040fed05

arch/arm/mach-omap2/pm34xx.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -39,7 +39,9 @@ 
struct power_state {

struct power_state {

	struct powerdomain *pwrdm;

	struct powerdomain *pwrdm;

	u32 next_state;

	u32 next_state;

#ifdef CONFIG_SUSPEND

	u32 saved_state;

	u32 saved_state;

#endif

	struct list_head node;

	struct list_head node;

};

};
@@ -293,6 +295,7 @@ static void omap3_pm_idle(void) 
	local_irq_enable();

	local_irq_enable();

}

}





#ifdef CONFIG_SUSPEND

static int omap3_pm_prepare(void)

static int omap3_pm_prepare(void)

{

{

	disable_hlt();

	disable_hlt();
@@ -366,6 +369,7 @@ static struct platform_suspend_ops omap_pm_ops = { 
	.finish		= omap3_pm_finish,

	.finish		= omap3_pm_finish,

	.valid		= suspend_valid_only_mem,

	.valid		= suspend_valid_only_mem,

};

};

#endif /* CONFIG_SUSPEND */









/**

/**
@@ -710,7 +714,9 @@ static int __init omap3_pm_init(void) 
	_omap_sram_idle = omap_sram_push(omap34xx_cpu_suspend,

	_omap_sram_idle = omap_sram_push(omap34xx_cpu_suspend,

					 omap34xx_cpu_suspend_sz);

					 omap34xx_cpu_suspend_sz);





#ifdef CONFIG_SUSPEND

	suspend_set_ops(&omap_pm_ops);

	suspend_set_ops(&omap_pm_ops);

#endif /* CONFIG_SUSPEND */





	pm_idle = omap3_pm_idle;

	pm_idle = omap3_pm_idle;