diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-arm/arch-aaec2000/io.h | 1 | ||||
-rw-r--r-- | include/asm-arm/arch-clps711x/io.h | 1 | ||||
-rw-r--r-- | include/asm-arm/arch-ebsa285/io.h | 8 | ||||
-rw-r--r-- | include/asm-arm/arch-integrator/io.h | 1 | ||||
-rw-r--r-- | include/asm-arm/arch-iop3xx/io.h | 1 | ||||
-rw-r--r-- | include/asm-arm/arch-l7200/io.h | 1 | ||||
-rw-r--r-- | include/asm-arm/arch-lh7a40x/io.h | 1 | ||||
-rw-r--r-- | include/asm-arm/arch-netx/io.h | 1 | ||||
-rw-r--r-- | include/asm-arm/arch-omap/io.h | 1 | ||||
-rw-r--r-- | include/asm-arm/arch-pxa/io.h | 1 | ||||
-rw-r--r-- | include/asm-arm/arch-realview/io.h | 1 | ||||
-rw-r--r-- | include/asm-arm/arch-sa1100/io.h | 1 | ||||
-rw-r--r-- | include/asm-arm/arch-versatile/io.h | 1 |
13 files changed, 0 insertions, 20 deletions
diff --git a/include/asm-arm/arch-aaec2000/io.h b/include/asm-arm/arch-aaec2000/io.h index 8d67907fd4f0..d710204ac747 100644 --- a/include/asm-arm/arch-aaec2000/io.h +++ b/include/asm-arm/arch-aaec2000/io.h | |||
@@ -16,6 +16,5 @@ | |||
16 | */ | 16 | */ |
17 | #define __io(a) ((void __iomem *)(a)) | 17 | #define __io(a) ((void __iomem *)(a)) |
18 | #define __mem_pci(a) (a) | 18 | #define __mem_pci(a) (a) |
19 | #define __mem_isa(a) (a) | ||
20 | 19 | ||
21 | #endif | 20 | #endif |
diff --git a/include/asm-arm/arch-clps711x/io.h b/include/asm-arm/arch-clps711x/io.h index 62613b0e2d96..53d790202c19 100644 --- a/include/asm-arm/arch-clps711x/io.h +++ b/include/asm-arm/arch-clps711x/io.h | |||
@@ -26,7 +26,6 @@ | |||
26 | 26 | ||
27 | #define __io(a) ((void __iomem *)(a)) | 27 | #define __io(a) ((void __iomem *)(a)) |
28 | #define __mem_pci(a) (a) | 28 | #define __mem_pci(a) (a) |
29 | #define __mem_isa(a) (a) | ||
30 | 29 | ||
31 | /* | 30 | /* |
32 | * We don't support ins[lb]/outs[lb]. Make them fault. | 31 | * We don't support ins[lb]/outs[lb]. Make them fault. |
diff --git a/include/asm-arm/arch-ebsa285/io.h b/include/asm-arm/arch-ebsa285/io.h index 776f9d377057..f9c729141860 100644 --- a/include/asm-arm/arch-ebsa285/io.h +++ b/include/asm-arm/arch-ebsa285/io.h | |||
@@ -24,7 +24,6 @@ | |||
24 | #define __io(a) ((void __iomem *)(PCIO_BASE + (a))) | 24 | #define __io(a) ((void __iomem *)(PCIO_BASE + (a))) |
25 | #if 1 | 25 | #if 1 |
26 | #define __mem_pci(a) (a) | 26 | #define __mem_pci(a) (a) |
27 | #define __mem_isa(a) ((a) + PCIMEM_BASE) | ||
28 | #else | 27 | #else |
29 | 28 | ||
30 | static inline void __iomem *___mem_pci(void __iomem *p) | 29 | static inline void __iomem *___mem_pci(void __iomem *p) |
@@ -34,14 +33,7 @@ static inline void __iomem *___mem_pci(void __iomem *p) | |||
34 | return p; | 33 | return p; |
35 | } | 34 | } |
36 | 35 | ||
37 | static inline void __iomem *___mem_isa(void __iomem *p) | ||
38 | { | ||
39 | unsigned long a = (unsigned long)p; | ||
40 | BUG_ON(a >= 16*1048576); | ||
41 | return p + PCIMEM_BASE; | ||
42 | } | ||
43 | #define __mem_pci(a) ___mem_pci(a) | 36 | #define __mem_pci(a) ___mem_pci(a) |
44 | #define __mem_isa(a) ___mem_isa(a) | ||
45 | #endif | 37 | #endif |
46 | 38 | ||
47 | #endif | 39 | #endif |
diff --git a/include/asm-arm/arch-integrator/io.h b/include/asm-arm/arch-integrator/io.h index 31f2deab51b0..c8f2175948bd 100644 --- a/include/asm-arm/arch-integrator/io.h +++ b/include/asm-arm/arch-integrator/io.h | |||
@@ -32,6 +32,5 @@ | |||
32 | 32 | ||
33 | #define __io(a) ((void __iomem *)(PCI_IO_VADDR + (a))) | 33 | #define __io(a) ((void __iomem *)(PCI_IO_VADDR + (a))) |
34 | #define __mem_pci(a) (a) | 34 | #define __mem_pci(a) (a) |
35 | #define __mem_isa(a) ((a) + PCI_MEMORY_VADDR) | ||
36 | 35 | ||
37 | #endif | 36 | #endif |
diff --git a/include/asm-arm/arch-iop3xx/io.h b/include/asm-arm/arch-iop3xx/io.h index f39046a6ab14..36adbdf5055a 100644 --- a/include/asm-arm/arch-iop3xx/io.h +++ b/include/asm-arm/arch-iop3xx/io.h | |||
@@ -17,6 +17,5 @@ | |||
17 | 17 | ||
18 | #define __io(p) ((void __iomem *)(p)) | 18 | #define __io(p) ((void __iomem *)(p)) |
19 | #define __mem_pci(a) (a) | 19 | #define __mem_pci(a) (a) |
20 | #define __mem_isa(a) (a) | ||
21 | 20 | ||
22 | #endif | 21 | #endif |
diff --git a/include/asm-arm/arch-l7200/io.h b/include/asm-arm/arch-l7200/io.h index cab8ad0adf09..cd080d8384d9 100644 --- a/include/asm-arm/arch-l7200/io.h +++ b/include/asm-arm/arch-l7200/io.h | |||
@@ -19,7 +19,6 @@ | |||
19 | */ | 19 | */ |
20 | #define __io_pci(a) ((void __iomem *)(PCIO_BASE + (a))) | 20 | #define __io_pci(a) ((void __iomem *)(PCIO_BASE + (a))) |
21 | #define __mem_pci(a) (a) | 21 | #define __mem_pci(a) (a) |
22 | #define __mem_isa(a) (a) | ||
23 | 22 | ||
24 | #define __ioaddr(p) __io_pci(p) | 23 | #define __ioaddr(p) __io_pci(p) |
25 | 24 | ||
diff --git a/include/asm-arm/arch-lh7a40x/io.h b/include/asm-arm/arch-lh7a40x/io.h index bbcd4335f441..17bc94097481 100644 --- a/include/asm-arm/arch-lh7a40x/io.h +++ b/include/asm-arm/arch-lh7a40x/io.h | |||
@@ -18,6 +18,5 @@ | |||
18 | /* No ISA or PCI bus on this machine. */ | 18 | /* No ISA or PCI bus on this machine. */ |
19 | #define __io(a) ((void __iomem *)(a)) | 19 | #define __io(a) ((void __iomem *)(a)) |
20 | #define __mem_pci(a) (a) | 20 | #define __mem_pci(a) (a) |
21 | #define __mem_isa(a) (a) | ||
22 | 21 | ||
23 | #endif /* __ASM_ARCH_IO_H */ | 22 | #endif /* __ASM_ARCH_IO_H */ |
diff --git a/include/asm-arm/arch-netx/io.h b/include/asm-arm/arch-netx/io.h index 81b7bc47747e..a7a53f80165d 100644 --- a/include/asm-arm/arch-netx/io.h +++ b/include/asm-arm/arch-netx/io.h | |||
@@ -24,6 +24,5 @@ | |||
24 | 24 | ||
25 | #define __io(a) ((void __iomem *)(a)) | 25 | #define __io(a) ((void __iomem *)(a)) |
26 | #define __mem_pci(a) (a) | 26 | #define __mem_pci(a) (a) |
27 | #define __mem_isa(a) (a) | ||
28 | 27 | ||
29 | #endif | 28 | #endif |
diff --git a/include/asm-arm/arch-omap/io.h b/include/asm-arm/arch-omap/io.h index b726acfcab14..78f68e6a4f0c 100644 --- a/include/asm-arm/arch-omap/io.h +++ b/include/asm-arm/arch-omap/io.h | |||
@@ -44,7 +44,6 @@ | |||
44 | */ | 44 | */ |
45 | #define __io(a) ((void __iomem *)(PCIO_BASE + (a))) | 45 | #define __io(a) ((void __iomem *)(PCIO_BASE + (a))) |
46 | #define __mem_pci(a) (a) | 46 | #define __mem_pci(a) (a) |
47 | #define __mem_isa(a) (a) | ||
48 | 47 | ||
49 | /* | 48 | /* |
50 | * ---------------------------------------------------------------------------- | 49 | * ---------------------------------------------------------------------------- |
diff --git a/include/asm-arm/arch-pxa/io.h b/include/asm-arm/arch-pxa/io.h index eb2dd58d397f..7f8d817b446f 100644 --- a/include/asm-arm/arch-pxa/io.h +++ b/include/asm-arm/arch-pxa/io.h | |||
@@ -16,6 +16,5 @@ | |||
16 | */ | 16 | */ |
17 | #define __io(a) ((void __iomem *)(a)) | 17 | #define __io(a) ((void __iomem *)(a)) |
18 | #define __mem_pci(a) (a) | 18 | #define __mem_pci(a) (a) |
19 | #define __mem_isa(a) (a) | ||
20 | 19 | ||
21 | #endif | 20 | #endif |
diff --git a/include/asm-arm/arch-realview/io.h b/include/asm-arm/arch-realview/io.h index d444a68ac330..c70f1dfbe135 100644 --- a/include/asm-arm/arch-realview/io.h +++ b/include/asm-arm/arch-realview/io.h | |||
@@ -29,6 +29,5 @@ static inline void __iomem *__io(unsigned long addr) | |||
29 | 29 | ||
30 | #define __io(a) __io(a) | 30 | #define __io(a) __io(a) |
31 | #define __mem_pci(a) (a) | 31 | #define __mem_pci(a) (a) |
32 | #define __mem_isa(a) (a) | ||
33 | 32 | ||
34 | #endif | 33 | #endif |
diff --git a/include/asm-arm/arch-sa1100/io.h b/include/asm-arm/arch-sa1100/io.h index 040ccde7a11e..0756269404b1 100644 --- a/include/asm-arm/arch-sa1100/io.h +++ b/include/asm-arm/arch-sa1100/io.h | |||
@@ -22,6 +22,5 @@ static inline void __iomem *__io(unsigned long addr) | |||
22 | } | 22 | } |
23 | #define __io(a) __io(a) | 23 | #define __io(a) __io(a) |
24 | #define __mem_pci(a) (a) | 24 | #define __mem_pci(a) (a) |
25 | #define __mem_isa(a) (a) | ||
26 | 25 | ||
27 | #endif | 26 | #endif |
diff --git a/include/asm-arm/arch-versatile/io.h b/include/asm-arm/arch-versatile/io.h index 47e904cf25c7..c4d01948e00b 100644 --- a/include/asm-arm/arch-versatile/io.h +++ b/include/asm-arm/arch-versatile/io.h | |||
@@ -28,6 +28,5 @@ static inline void __iomem *__io(unsigned long addr) | |||
28 | } | 28 | } |
29 | #define __io(a) __io(a) | 29 | #define __io(a) __io(a) |
30 | #define __mem_pci(a) (a) | 30 | #define __mem_pci(a) (a) |
31 | #define __mem_isa(a) (a) | ||
32 | 31 | ||
33 | #endif | 32 | #endif |