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

Commit ed313489 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] 5330/1: mach-pxa: Fixup reset for systems using reboot=cold or other strings
  [ARM] pxa: fix incorrect PCMCIA PSKTSEL pin configuration for spitz
  [ARM] pxa: fix I2C controller device being registered twice on Akita
  pxafb: only initialize the smart panel thread when dealing with a smartpanel
  pxafb: introduce LCD_TYPE_MASK and use it.
parents 13d428af 28105fda

arch/arm/mach-pxa/include/mach/pxafb.h

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#define LCD_CONN_TYPE(_x)	((_x) & 0x0f)

#define LCD_CONN_WIDTH(_x)	(((_x) >> 4) & 0x1f)



#define LCD_TYPE_MASK		0xf

#define LCD_TYPE_UNKNOWN	0

#define LCD_TYPE_MONO_STN	1

#define LCD_TYPE_MONO_DSTN	2

arch/arm/mach-pxa/reset.c

+4 −3
Original line number Diff line number Diff line
@@ -90,12 +90,13 @@ void arch_reset(char mode) 
		/* Jump into ROM at address 0 */

		cpu_reset(0);

		break;

	case 'h':

		do_hw_reset();

		break;

	case 'g':

		do_gpio_reset();

		break;

	case 'h':

	default:

		do_hw_reset();

		break;

	}

}

arch/arm/mach-pxa/spitz.c

+2 −2
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ 
static unsigned long spitz_pin_config[] __initdata = {

	/* Chip Selects */

	GPIO78_nCS_2,	/* SCOOP #2 */

	GPIO79_nCS_3,	/* NAND */

	GPIO80_nCS_4,	/* SCOOP #1 */



	/* LCD - 16bpp Active TFT */
@@ -97,10 +98,10 @@ static unsigned long spitz_pin_config[] __initdata = { 
	GPIO51_nPIOW,

	GPIO85_nPCE_1,

	GPIO54_nPCE_2,

	GPIO79_PSKTSEL,

	GPIO55_nPREG,

	GPIO56_nPWAIT,

	GPIO57_nIOIS16,

	GPIO104_PSKTSEL,



	/* MMC */

	GPIO32_MMC_CLK,
@@ -686,7 +687,6 @@ static void __init akita_init(void) 
	spitz_pcmcia_config.num_devs = 1;

	platform_scoop_config = &spitz_pcmcia_config;



	pxa_set_i2c_info(NULL);

	i2c_register_board_info(0, ARRAY_AND_SIZE(akita_i2c_board_info));



	common_init();

drivers/video/pxafb.c

+4 −1
Original line number Diff line number Diff line
@@ -804,6 +804,9 @@ static int pxafb_smart_thread(void *arg) 


static int pxafb_smart_init(struct pxafb_info *fbi)

{

	if (!(fbi->lccr0 | LCCR0_LCDT))

		return 0;



	fbi->smart_thread = kthread_run(pxafb_smart_thread, fbi,

					"lcd_refresh");

	if (IS_ERR(fbi->smart_thread)) {
@@ -1372,7 +1375,7 @@ static void pxafb_decode_mach_info(struct pxafb_info *fbi, 
	fbi->cmap_inverse	= inf->cmap_inverse;

	fbi->cmap_static	= inf->cmap_static;



	switch (lcd_conn & 0xf) {

	switch (lcd_conn & LCD_TYPE_MASK) {

	case LCD_TYPE_MONO_STN:

		fbi->lccr0 = LCCR0_CMS;

		break;