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

Commit 42637c59 authored by Heiko Stuebner's avatar Heiko Stuebner Committed by Kukjin Kim
Browse files

ARM: S3C24XX: only store clock registers when old clock code is active 



The Samsung ccf driver already handles the save and restore of the clock
registers on suspend and resume. The architecture code should not
duplicate this when the ccf is active.

Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Reviewed-by: default avatarTomasz Figa <t.figa@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent dfc0f509

arch/arm/mach-s3c24xx/pm.c

+10 −3
Original line number Diff line number Diff line
@@ -51,9 +51,6 @@ 
#define PFX "s3c24xx-pm: "



static struct sleep_save core_save[] = {

	SAVE_ITEM(S3C2410_LOCKTIME),

	SAVE_ITEM(S3C2410_CLKCON),



	/* we restore the timings here, with the proviso that the board

	 * brings the system up in an slower, or equal frequency setting

	 * to the original system.
@@ -70,6 +67,9 @@ static struct sleep_save core_save[] = { 
	SAVE_ITEM(S3C2410_BANKCON4),

	SAVE_ITEM(S3C2410_BANKCON5),



#ifdef CONFIG_SAMSUNG_CLOCK

	SAVE_ITEM(S3C2410_LOCKTIME),

	SAVE_ITEM(S3C2410_CLKCON),

#ifndef CONFIG_CPU_FREQ

	SAVE_ITEM(S3C2410_CLKDIVN),

	SAVE_ITEM(S3C2410_MPLLCON),
@@ -77,11 +77,14 @@ static struct sleep_save core_save[] = { 
#endif

	SAVE_ITEM(S3C2410_UPLLCON),

	SAVE_ITEM(S3C2410_CLKSLOW),

#endif /* CONFIG_SAMSUNG_CLOCK */

};



#ifdef CONFIG_SAMSUNG_CLOCK

static struct sleep_save misc_save[] = {

	SAVE_ITEM(S3C2410_DCLKCON),

};

#endif



/* s3c_pm_check_resume_pin

 *
@@ -140,12 +143,16 @@ void s3c_pm_configure_extint(void) 
void s3c_pm_restore_core(void)

{

	s3c_pm_do_restore_core(core_save, ARRAY_SIZE(core_save));

#ifdef CONFIG_SAMSUNG_CLOCK

	s3c_pm_do_restore(misc_save, ARRAY_SIZE(misc_save));

#endif

}



void s3c_pm_save_core(void)

{

#ifdef CONFIG_SAMSUNG_CLOCK

	s3c_pm_do_save(misc_save, ARRAY_SIZE(misc_save));

#endif

	s3c_pm_do_save(core_save, ARRAY_SIZE(core_save));

}