diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-17 10:45:03 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-17 10:45:03 +0000 |
| commit | 12a8ab152d6b0c9f697d0f2bd423001ed3fd360b (patch) | |
| tree | e49bed406111a9ea84d92b415ebf7b1eda5c7b00 /arch | |
| parent | e14c8bf86350f6c39186a139c5c584a6111b2f01 (diff) | |
| parent | faf2f0ab13d259f2386d156d24c405ec8cee30ff (diff) | |
| download | kernel-crypto-12a8ab152d6b0c9f697d0f2bd423001ed3fd360b.tar.gz kernel-crypto-12a8ab152d6b0c9f697d0f2bd423001ed3fd360b.tar.xz kernel-crypto-12a8ab152d6b0c9f697d0f2bd423001ed3fd360b.zip | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/pxafb.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/spitz.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/include/mach/pxafb.h b/arch/arm/mach-pxa/include/mach/pxafb.h index 8e591118371..cbda4d35c42 100644 --- a/arch/arm/mach-pxa/include/mach/pxafb.h +++ b/arch/arm/mach-pxa/include/mach/pxafb.h @@ -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 diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index f0a5bbae0b4..3be76ee2bdb 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c @@ -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(); |