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

Commit 9f34073b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 4598/2: OSIRIS: Ensure we do not get nRSTOUT during suspend
  [ARM] 4597/2: OSIRIS: ensure CPLD0 is preserved after suspend
parents c946b304 4afcddae

arch/arm/mach-s3c2440/mach-osiris.c

+18 −0
Original line number Diff line number Diff line
@@ -276,7 +276,21 @@ static unsigned char pm_osiris_ctrl0; 


static int osiris_pm_suspend(struct sys_device *sd, pm_message_t state)

{

	unsigned int tmp;



	pm_osiris_ctrl0 = __raw_readb(OSIRIS_VA_CTRL0);

	tmp = pm_osiris_ctrl0 & ~OSIRIS_CTRL0_NANDSEL;



	/* ensure correct NAND slot is selected on resume */

	if ((pm_osiris_ctrl0 & OSIRIS_CTRL0_BOOT_INT) == 0)

	        tmp |= 2;



	__raw_writeb(tmp, OSIRIS_VA_CTRL0);



	/* ensure that an nRESET is not generated on resume. */

	s3c2410_gpio_setpin(S3C2410_GPA21, 1);

	s3c2410_gpio_cfgpin(S3C2410_GPA21, S3C2410_GPA21_OUT);



	return 0;

}
@@ -285,6 +299,10 @@ static int osiris_pm_resume(struct sys_device *sd) 
	if (pm_osiris_ctrl0 & OSIRIS_CTRL0_FIX8)

		__raw_writeb(OSIRIS_CTRL1_FIX8, OSIRIS_VA_CTRL1);



	__raw_writeb(pm_osiris_ctrl0, OSIRIS_VA_CTRL0);



	s3c2410_gpio_cfgpin(S3C2410_GPA21, S3C2410_GPA21_nRSTOUT);



	return 0;

}