diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-15 19:08:50 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-15 19:08:50 -0400 |
commit | 65a6ec0d72a07f16719e9b7a96e1c4bae044b591 (patch) | |
tree | 344e03a5039a44982c1b78d6113633b21b434820 /include/asm-arm/arch-pxa/zylonite.h | |
parent | 541010e4b8921cd781ff02ae68028501457045b6 (diff) | |
parent | 0181b61a988424b5cc44fe09e6968142359c815e (diff) |
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (95 commits)
[ARM] 4578/1: CM-x270: PCMCIA support
[ARM] 4577/1: ITE 8152 PCI bridge support
[ARM] 4576/1: CM-X270 machine support
[ARM] pxa: Avoid pxa_gpio_mode() in gpio_direction_{in,out}put()
[ARM] pxa: move pxa_set_mode() from pxa2xx_mainstone.c to mainstone.c
[ARM] pxa: move pxa_set_mode() from pxa2xx_lubbock.c to lubbock.c
[ARM] pxa: Make cpu_is_pxaXXX dependent on configuration symbols
[ARM] pxa: PXA3xx base support
[NET] smc91x: fix PXA DMA support code
[SERIAL] Fix console initialisation ordering
[ARM] pxa: tidy up arch/arm/mach-pxa/Makefile
[ARM] Update arch/arm/Kconfig for drivers/Kconfig changes
[ARM] 4600/1: fix kernel build failure with build-id-supporting binutils
[ARM] 4599/1: Preserve ATAG list for use with kexec (2.6.23)
[ARM] Rename consistent_sync() as dma_cache_maint()
[ARM] 4572/1: ep93xx: add cirrus logic edb9307 support
[ARM] 4596/1: S3C2412: Correct IRQs for SDI+CF and add decoding support
[ARM] 4595/1: ns9xxx: define registers as void __iomem * instead of volatile u32
[ARM] 4594/1: ns9xxx: use the new gpio functions
[ARM] 4593/1: ns9xxx: implement generic clockevents
...
Diffstat (limited to 'include/asm-arm/arch-pxa/zylonite.h')
-rw-r--r-- | include/asm-arm/arch-pxa/zylonite.h | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/include/asm-arm/arch-pxa/zylonite.h b/include/asm-arm/arch-pxa/zylonite.h new file mode 100644 index 000000000000..f58b59162b82 --- /dev/null +++ b/include/asm-arm/arch-pxa/zylonite.h | |||
@@ -0,0 +1,35 @@ | |||
1 | #ifndef __ASM_ARCH_ZYLONITE_H | ||
2 | #define __ASM_ARCH_ZYLONITE_H | ||
3 | |||
4 | #define ZYLONITE_ETH_PHYS 0x14000000 | ||
5 | |||
6 | /* the following variables are processor specific and initialized | ||
7 | * by the corresponding zylonite_pxa3xx_init() | ||
8 | */ | ||
9 | extern int gpio_backlight; | ||
10 | extern int gpio_eth_irq; | ||
11 | |||
12 | extern int lcd_id; | ||
13 | extern int lcd_orientation; | ||
14 | |||
15 | #ifdef CONFIG_CPU_PXA300 | ||
16 | extern void zylonite_pxa300_init(void); | ||
17 | #else | ||
18 | static inline void zylonite_pxa300_init(void) | ||
19 | { | ||
20 | if (cpu_is_pxa300() || cpu_is_pxa310()) | ||
21 | panic("%s: PXA300/PXA310 not supported\n", __FUNCTION__); | ||
22 | } | ||
23 | #endif | ||
24 | |||
25 | #ifdef CONFIG_CPU_PXA320 | ||
26 | extern void zylonite_pxa320_init(void); | ||
27 | #else | ||
28 | static inline void zylonite_pxa320_init(void) | ||
29 | { | ||
30 | if (cpu_is_pxa320()) | ||
31 | panic("%s: PXA320 not supported\n", __FUNCTION__); | ||
32 | } | ||
33 | #endif | ||
34 | |||
35 | #endif /* __ASM_ARCH_ZYLONITE_H */ | ||