Commit 2b300d20 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] 4691/1: add missing i2c_board_info struct for at91rm9200
  [ARM] 4735/1: Unbreak pxa25x suspend/resume
parents 3ce54450 430cb436

arch/arm/mach-at91/board-ek.c

+9 −0
Original line number Diff line number Diff line
@@ -109,6 +109,15 @@ static struct spi_board_info ek_spi_devices[] = { 
#endif

};



static struct i2c_board_info __initdata ek_i2c_devices[] = {

	{

		I2C_BOARD_INFO("ics1523", 0x26),

	},

	{

		I2C_BOARD_INFO("dac3550", 0x4d),

	}

};



#define EK_FLASH_BASE	AT91_CHIPSELECT_0

#define EK_FLASH_SIZE	0x200000

arch/arm/mach-pxa/pxa25x.c

+12 −1
Original line number Diff line number Diff line
@@ -178,13 +178,19 @@ static void pxa25x_cpu_pm_save(unsigned long *sleep_save) 
	SAVE(GAFR1_L); SAVE(GAFR1_U);

	SAVE(GAFR2_L); SAVE(GAFR2_U);



	SAVE(ICMR);

	SAVE(ICMR); ICMR = 0;

	SAVE(CKEN);

	SAVE(PSTR);



	/* Clear GPIO transition detect bits */

	GEDR0 = GEDR0; GEDR1 = GEDR1; GEDR2 = GEDR2;

}



static void pxa25x_cpu_pm_restore(unsigned long *sleep_save)

{

	/* ensure not to come back here if it wasn't intended */

	PSPR = 0;



	/* restore registers */

	RESTORE_GPLEVEL(0); RESTORE_GPLEVEL(1); RESTORE_GPLEVEL(2);

	RESTORE(GPDR0); RESTORE(GPDR1); RESTORE(GPDR2);
@@ -195,7 +201,12 @@ static void pxa25x_cpu_pm_restore(unsigned long *sleep_save) 
	RESTORE(GFER0); RESTORE(GFER1); RESTORE(GFER2);

	RESTORE(PGSR0); RESTORE(PGSR1); RESTORE(PGSR2);



	PSSR = PSSR_RDH | PSSR_PH;



	RESTORE(CKEN);



	ICLR = 0;

	ICCR = 1;

	RESTORE(ICMR);

	RESTORE(PSTR);

}