aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-arm
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-05-06 14:59:18 -0400
committerDavid Woodhouse <dwmw2@infradead.org>2006-05-06 14:59:18 -0400
commit5047f09b56d0bc3c21aec9cb16de60283da645c6 (patch)
tree09a07554b933c3bb912ce3bfc0ea7c7e1f16041c /include/asm-arm
parentc0f1fe00c3923135b2c2f443448585482da8a53e (diff)
parent5528e568a760442e0ec8fd2dea1f0791875a066b (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include/asm-arm')
-rw-r--r--include/asm-arm/arch-imx/imx-uart.h10
-rw-r--r--include/asm-arm/arch-ixp4xx/io.h7
-rw-r--r--include/asm-arm/arch-ixp4xx/memory.h2
-rw-r--r--include/asm-arm/arch-pxa/dma.h26
-rw-r--r--include/asm-arm/bug.h1
-rw-r--r--include/asm-arm/unistd.h23
6 files changed, 48 insertions, 21 deletions
diff --git a/include/asm-arm/arch-imx/imx-uart.h b/include/asm-arm/arch-imx/imx-uart.h
new file mode 100644
index 000000000000..3a685e1780ea
--- /dev/null
+++ b/include/asm-arm/arch-imx/imx-uart.h
@@ -0,0 +1,10 @@
1#ifndef ASMARM_ARCH_UART_H
2#define ASMARM_ARCH_UART_H
3
4#define IMXUART_HAVE_RTSCTS (1<<0)
5
6struct imxuart_platform_data {
7 unsigned int flags;
8};
9
10#endif
diff --git a/include/asm-arm/arch-ixp4xx/io.h b/include/asm-arm/arch-ixp4xx/io.h
index 942b622455bc..b59520e56fc7 100644
--- a/include/asm-arm/arch-ixp4xx/io.h
+++ b/include/asm-arm/arch-ixp4xx/io.h
@@ -260,6 +260,12 @@ out:
260 260
261#endif 261#endif
262 262
263#ifndef CONFIG_PCI
264
265#define __io(v) v
266
267#else
268
263/* 269/*
264 * IXP4xx does not have a transparent cpu -> PCI I/O translation 270 * IXP4xx does not have a transparent cpu -> PCI I/O translation
265 * window. Instead, it has a set of registers that must be tweaked 271 * window. Instead, it has a set of registers that must be tweaked
@@ -578,6 +584,7 @@ __ixp4xx_iowrite32_rep(void __iomem *addr, const void *vaddr, u32 count)
578 584
579#define ioport_map(port, nr) ((void __iomem*)(port + PIO_OFFSET)) 585#define ioport_map(port, nr) ((void __iomem*)(port + PIO_OFFSET))
580#define ioport_unmap(addr) 586#define ioport_unmap(addr)
587#endif // !CONFIG_PCI
581 588
582#endif // __ASM_ARM_ARCH_IO_H 589#endif // __ASM_ARM_ARCH_IO_H
583 590
diff --git a/include/asm-arm/arch-ixp4xx/memory.h b/include/asm-arm/arch-ixp4xx/memory.h
index ee211d28a3ef..af9667b57ab3 100644
--- a/include/asm-arm/arch-ixp4xx/memory.h
+++ b/include/asm-arm/arch-ixp4xx/memory.h
@@ -14,7 +14,7 @@
14 */ 14 */
15#define PHYS_OFFSET UL(0x00000000) 15#define PHYS_OFFSET UL(0x00000000)
16 16
17#ifndef __ASSEMBLY__ 17#if !defined(__ASSEMBLY__) && defined(CONFIG_PCI)
18 18
19void ixp4xx_adjust_zones(int node, unsigned long *size, unsigned long *holes); 19void ixp4xx_adjust_zones(int node, unsigned long *size, unsigned long *holes);
20 20
diff --git a/include/asm-arm/arch-pxa/dma.h b/include/asm-arm/arch-pxa/dma.h
index 3e88a2a02a0f..a008150abc59 100644
--- a/include/asm-arm/arch-pxa/dma.h
+++ b/include/asm-arm/arch-pxa/dma.h
@@ -24,27 +24,29 @@ typedef struct pxa_dma_desc {
24 volatile u32 dcmd; /* DCMD value for the current transfer */ 24 volatile u32 dcmd; /* DCMD value for the current transfer */
25} pxa_dma_desc; 25} pxa_dma_desc;
26 26
27typedef enum {
28 DMA_PRIO_HIGH = 0,
29 DMA_PRIO_MEDIUM = 1,
30 DMA_PRIO_LOW = 2
31} pxa_dma_prio;
32
27#if defined(CONFIG_PXA27x) 33#if defined(CONFIG_PXA27x)
28 34
29#define PXA_DMA_CHANNELS 32 35#define PXA_DMA_CHANNELS 32
30#define PXA_DMA_NBCH(prio) ((prio == DMA_PRIO_LOW) ? 16 : 8)
31 36
32typedef enum { 37#define pxa_for_each_dma_prio(ch, prio) \
33 DMA_PRIO_HIGH = 0, 38for ( \
34 DMA_PRIO_MEDIUM = 8, 39 ch = prio * 4; \
35 DMA_PRIO_LOW = 16 40 ch != (4 << prio) + 16; \
36} pxa_dma_prio; 41 ch = (ch + 1 == (4 << prio)) ? (prio * 4 + 16) : (ch + 1) \
42)
37 43
38#elif defined(CONFIG_PXA25x) 44#elif defined(CONFIG_PXA25x)
39 45
40#define PXA_DMA_CHANNELS 16 46#define PXA_DMA_CHANNELS 16
41#define PXA_DMA_NBCH(prio) ((prio == DMA_PRIO_LOW) ? 8 : 4)
42 47
43typedef enum { 48#define pxa_for_each_dma_prio(ch, prio) \
44 DMA_PRIO_HIGH = 0, 49 for (ch = prio * 4; ch != (4 << prio); ch++)
45 DMA_PRIO_MEDIUM = 4,
46 DMA_PRIO_LOW = 8
47} pxa_dma_prio;
48 50
49#endif 51#endif
50 52
diff --git a/include/asm-arm/bug.h b/include/asm-arm/bug.h
index 0e36fd5d87df..7fb02138f585 100644
--- a/include/asm-arm/bug.h
+++ b/include/asm-arm/bug.h
@@ -1,6 +1,7 @@
1#ifndef _ASMARM_BUG_H 1#ifndef _ASMARM_BUG_H
2#define _ASMARM_BUG_H 2#define _ASMARM_BUG_H
3 3
4#include <linux/config.h>
4 5
5#ifdef CONFIG_BUG 6#ifdef CONFIG_BUG
6#ifdef CONFIG_DEBUG_BUGVERBOSE 7#ifdef CONFIG_DEBUG_BUGVERBOSE
diff --git a/include/asm-arm/unistd.h b/include/asm-arm/unistd.h
index a5896d94e1ad..1e891f860ef3 100644
--- a/include/asm-arm/unistd.h
+++ b/include/asm-arm/unistd.h
@@ -361,7 +361,7 @@
361/* 361/*
362 * The following syscalls are obsolete and no longer available for EABI. 362 * The following syscalls are obsolete and no longer available for EABI.
363 */ 363 */
364#if defined(__ARM_EABI__) 364#if defined(__ARM_EABI__) && !defined(__KERNEL__)
365#undef __NR_time 365#undef __NR_time
366#undef __NR_umount 366#undef __NR_umount
367#undef __NR_stime 367#undef __NR_stime
@@ -411,7 +411,8 @@ type name(void) { \
411 __asm__ __volatile__ ( \ 411 __asm__ __volatile__ ( \
412 __syscall(name) \ 412 __syscall(name) \
413 : "=r" (__res_r0) \ 413 : "=r" (__res_r0) \
414 : __SYS_REG_LIST() ); \ 414 : __SYS_REG_LIST() \
415 : "memory" ); \
415 __res = __res_r0; \ 416 __res = __res_r0; \
416 __syscall_return(type,__res); \ 417 __syscall_return(type,__res); \
417} 418}
@@ -425,7 +426,8 @@ type name(type1 arg1) { \
425 __asm__ __volatile__ ( \ 426 __asm__ __volatile__ ( \
426 __syscall(name) \ 427 __syscall(name) \
427 : "=r" (__res_r0) \ 428 : "=r" (__res_r0) \
428 : __SYS_REG_LIST( "0" (__r0) ) ); \ 429 : __SYS_REG_LIST( "0" (__r0) ) \
430 : "memory" ); \
429 __res = __res_r0; \ 431 __res = __res_r0; \
430 __syscall_return(type,__res); \ 432 __syscall_return(type,__res); \
431} 433}
@@ -440,7 +442,8 @@ type name(type1 arg1,type2 arg2) { \
440 __asm__ __volatile__ ( \ 442 __asm__ __volatile__ ( \
441 __syscall(name) \ 443 __syscall(name) \
442 : "=r" (__res_r0) \ 444 : "=r" (__res_r0) \
443 : __SYS_REG_LIST( "0" (__r0), "r" (__r1) ) ); \ 445 : __SYS_REG_LIST( "0" (__r0), "r" (__r1) ) \
446 : "memory" ); \
444 __res = __res_r0; \ 447 __res = __res_r0; \
445 __syscall_return(type,__res); \ 448 __syscall_return(type,__res); \
446} 449}
@@ -457,7 +460,8 @@ type name(type1 arg1,type2 arg2,type3 arg3) { \
457 __asm__ __volatile__ ( \ 460 __asm__ __volatile__ ( \
458 __syscall(name) \ 461 __syscall(name) \
459 : "=r" (__res_r0) \ 462 : "=r" (__res_r0) \
460 : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2) ) ); \ 463 : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2) ) \
464 : "memory" ); \
461 __res = __res_r0; \ 465 __res = __res_r0; \
462 __syscall_return(type,__res); \ 466 __syscall_return(type,__res); \
463} 467}
@@ -475,7 +479,8 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4) { \
475 __asm__ __volatile__ ( \ 479 __asm__ __volatile__ ( \
476 __syscall(name) \ 480 __syscall(name) \
477 : "=r" (__res_r0) \ 481 : "=r" (__res_r0) \
478 : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2), "r" (__r3) ) ); \ 482 : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2), "r" (__r3) ) \
483 : "memory" ); \
479 __res = __res_r0; \ 484 __res = __res_r0; \
480 __syscall_return(type,__res); \ 485 __syscall_return(type,__res); \
481} 486}
@@ -495,7 +500,8 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) { \
495 __syscall(name) \ 500 __syscall(name) \
496 : "=r" (__res_r0) \ 501 : "=r" (__res_r0) \
497 : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2), \ 502 : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2), \
498 "r" (__r3), "r" (__r4) ) ); \ 503 "r" (__r3), "r" (__r4) ) \
504 : "memory" ); \
499 __res = __res_r0; \ 505 __res = __res_r0; \
500 __syscall_return(type,__res); \ 506 __syscall_return(type,__res); \
501} 507}
@@ -515,7 +521,8 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6
515 __syscall(name) \ 521 __syscall(name) \
516 : "=r" (__res_r0) \ 522 : "=r" (__res_r0) \
517 : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2), \ 523 : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2), \
518 "r" (__r3), "r" (__r4), "r" (__r5) ) ); \ 524 "r" (__r3), "r" (__r4), "r" (__r5) ) \
525 : "memory" ); \
519 __res = __res_r0; \ 526 __res = __res_r0; \
520 __syscall_return(type,__res); \ 527 __syscall_return(type,__res); \
521} 528}
generated by cgit v1.2.2 (git 2.25.0) at 2024-09-30 22:31:15 -0400