tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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.

Linus Torvalds ed313489 13d428af

+11 -6
unified split
+1
arch/arm/mach-pxa/include/mach/pxafb.h
··· 33 33 #define LCD_CONN_TYPE(_x) ((_x) & 0x0f) 34 34 #define LCD_CONN_WIDTH(_x) (((_x) >> 4) & 0x1f) 35 35 36 + #define LCD_TYPE_MASK 0xf 36 37 #define LCD_TYPE_UNKNOWN 0 37 38 #define LCD_TYPE_MONO_STN 1 38 39 #define LCD_TYPE_MONO_DSTN 2
+4 -3
arch/arm/mach-pxa/reset.c
··· 90 90 /* Jump into ROM at address 0 */ 91 91 cpu_reset(0); 92 92 break; 93 - case 'h': 94 - do_hw_reset(); 95 - break; 96 93 case 'g': 97 94 do_gpio_reset(); 95 + break; 96 + case 'h': 97 + default: 98 + do_hw_reset(); 98 99 break; 99 100 } 100 101 }
+2 -2
arch/arm/mach-pxa/spitz.c
··· 67 67 static unsigned long spitz_pin_config[] __initdata = { 68 68 /* Chip Selects */ 69 69 GPIO78_nCS_2, /* SCOOP #2 */ 70 + GPIO79_nCS_3, /* NAND */ 70 71 GPIO80_nCS_4, /* SCOOP #1 */ 71 72 72 73 /* LCD - 16bpp Active TFT */ ··· 98 97 GPIO51_nPIOW, 99 98 GPIO85_nPCE_1, 100 99 GPIO54_nPCE_2, 101 - GPIO79_PSKTSEL, 102 100 GPIO55_nPREG, 103 101 GPIO56_nPWAIT, 104 102 GPIO57_nIOIS16, 103 + GPIO104_PSKTSEL, 105 104 106 105 /* MMC */ 107 106 GPIO32_MMC_CLK, ··· 687 686 spitz_pcmcia_config.num_devs = 1; 688 687 platform_scoop_config = &spitz_pcmcia_config; 689 688 690 - pxa_set_i2c_info(NULL); 691 689 i2c_register_board_info(0, ARRAY_AND_SIZE(akita_i2c_board_info)); 692 690 693 691 common_init();
+4 -1
drivers/video/pxafb.c
··· 804 804 805 805 static int pxafb_smart_init(struct pxafb_info *fbi) 806 806 { 807 + if (!(fbi->lccr0 | LCCR0_LCDT)) 808 + return 0; 809 + 807 810 fbi->smart_thread = kthread_run(pxafb_smart_thread, fbi, 808 811 "lcd_refresh"); 809 812 if (IS_ERR(fbi->smart_thread)) { ··· 1375 1372 fbi->cmap_inverse = inf->cmap_inverse; 1376 1373 fbi->cmap_static = inf->cmap_static; 1377 1374 1378 - switch (lcd_conn & 0xf) { 1375 + switch (lcd_conn & LCD_TYPE_MASK) { 1379 1376 case LCD_TYPE_MONO_STN: 1380 1377 fbi->lccr0 = LCCR0_CMS; 1381 1378 break;