diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-05 11:14:15 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 04:55:48 -0400 |
commit | a09e64fbc0094e3073dbb09c3b4bfe4ab669244b (patch) | |
tree | 69689f467179891b498bd7423fcf61925173db31 /arch/arm/mach-rpc | |
parent | a1b81a84fff05dbfef45b7012c26e1fee9973e5d (diff) |
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
This just leaves include/asm-arm/plat-* to deal with.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-rpc')
-rw-r--r-- | arch/arm/mach-rpc/dma.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-rpc/include/mach/acornfb.h | 140 | ||||
-rw-r--r-- | arch/arm/mach-rpc/include/mach/debug-macro.S | 25 | ||||
-rw-r--r-- | arch/arm/mach-rpc/include/mach/dma.h | 33 | ||||
-rw-r--r-- | arch/arm/mach-rpc/include/mach/entry-macro.S | 16 | ||||
-rw-r--r-- | arch/arm/mach-rpc/include/mach/hardware.h | 83 | ||||
-rw-r--r-- | arch/arm/mach-rpc/include/mach/io.h | 258 | ||||
-rw-r--r-- | arch/arm/mach-rpc/include/mach/irqs.h | 46 | ||||
-rw-r--r-- | arch/arm/mach-rpc/include/mach/memory.h | 39 | ||||
-rw-r--r-- | arch/arm/mach-rpc/include/mach/system.h | 27 | ||||
-rw-r--r-- | arch/arm/mach-rpc/include/mach/timex.h | 17 | ||||
-rw-r--r-- | arch/arm/mach-rpc/include/mach/uncompress.h | 198 | ||||
-rw-r--r-- | arch/arm/mach-rpc/include/mach/vmalloc.h | 10 | ||||
-rw-r--r-- | arch/arm/mach-rpc/riscpc.c | 2 |
14 files changed, 894 insertions, 2 deletions
diff --git a/arch/arm/mach-rpc/dma.c b/arch/arm/mach-rpc/dma.c index fb1d42b5378..4b19fe48419 100644 --- a/arch/arm/mach-rpc/dma.c +++ b/arch/arm/mach-rpc/dma.c | |||
@@ -20,7 +20,7 @@ | |||
20 | #include <asm/fiq.h> | 20 | #include <asm/fiq.h> |
21 | #include <asm/io.h> | 21 | #include <asm/io.h> |
22 | #include <asm/irq.h> | 22 | #include <asm/irq.h> |
23 | #include <asm/arch/hardware.h> | 23 | #include <mach/hardware.h> |
24 | #include <asm/uaccess.h> | 24 | #include <asm/uaccess.h> |
25 | 25 | ||
26 | #include <asm/mach/dma.h> | 26 | #include <asm/mach/dma.h> |
diff --git a/arch/arm/mach-rpc/include/mach/acornfb.h b/arch/arm/mach-rpc/include/mach/acornfb.h new file mode 100644 index 00000000000..395d76288ff --- /dev/null +++ b/arch/arm/mach-rpc/include/mach/acornfb.h | |||
@@ -0,0 +1,140 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-rpc/include/mach/acornfb.h | ||
3 | * | ||
4 | * Copyright (C) 1999 Russell King | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | * | ||
10 | * AcornFB architecture specific code | ||
11 | */ | ||
12 | |||
13 | #define acornfb_bandwidth(var) ((var)->pixclock * 8 / (var)->bits_per_pixel) | ||
14 | |||
15 | static inline int | ||
16 | acornfb_valid_pixrate(struct fb_var_screeninfo *var) | ||
17 | { | ||
18 | u_long limit; | ||
19 | |||
20 | if (!var->pixclock) | ||
21 | return 0; | ||
22 | |||
23 | /* | ||
24 | * Limits below are taken from RISC OS bandwidthlimit file | ||
25 | */ | ||
26 | if (current_par.using_vram) { | ||
27 | if (current_par.vram_half_sam == 2048) | ||
28 | limit = 6578; | ||
29 | else | ||
30 | limit = 13157; | ||
31 | } else { | ||
32 | limit = 26315; | ||
33 | } | ||
34 | |||
35 | return acornfb_bandwidth(var) >= limit; | ||
36 | } | ||
37 | |||
38 | /* | ||
39 | * Try to find the best PLL parameters for the pixel clock. | ||
40 | * This algorithm seems to give best predictable results, | ||
41 | * and produces the same values as detailed in the VIDC20 | ||
42 | * data sheet. | ||
43 | */ | ||
44 | static inline u_int | ||
45 | acornfb_vidc20_find_pll(u_int pixclk) | ||
46 | { | ||
47 | u_int r, best_r = 2, best_v = 2; | ||
48 | int best_d = 0x7fffffff; | ||
49 | |||
50 | for (r = 2; r <= 32; r++) { | ||
51 | u_int rr, v, p; | ||
52 | int d; | ||
53 | |||
54 | rr = 41667 * r; | ||
55 | |||
56 | v = (rr + pixclk / 2) / pixclk; | ||
57 | |||
58 | if (v > 32 || v < 2) | ||
59 | continue; | ||
60 | |||
61 | p = (rr + v / 2) / v; | ||
62 | |||
63 | d = pixclk - p; | ||
64 | |||
65 | if (d < 0) | ||
66 | d = -d; | ||
67 | |||
68 | if (d < best_d) { | ||
69 | best_d = d; | ||
70 | best_v = v - 1; | ||
71 | best_r = r - 1; | ||
72 | } | ||
73 | |||
74 | if (d == 0) | ||
75 | break; | ||
76 | } | ||
77 | |||
78 | return best_v << 8 | best_r; | ||
79 | } | ||
80 | |||
81 | static inline void | ||
82 | acornfb_vidc20_find_rates(struct vidc_timing *vidc, | ||
83 | struct fb_var_screeninfo *var) | ||
84 | { | ||
85 | u_int div; | ||
86 | |||
87 | /* Select pixel-clock divisor to keep PLL in range */ | ||
88 | div = var->pixclock / 9090; /*9921*/ | ||
89 | |||
90 | /* Limit divisor */ | ||
91 | if (div == 0) | ||
92 | div = 1; | ||
93 | if (div > 8) | ||
94 | div = 8; | ||
95 | |||
96 | /* Encode divisor to VIDC20 setting */ | ||
97 | switch (div) { | ||
98 | case 1: vidc->control |= VIDC20_CTRL_PIX_CK; break; | ||
99 | case 2: vidc->control |= VIDC20_CTRL_PIX_CK2; break; | ||
100 | case 3: vidc->control |= VIDC20_CTRL_PIX_CK3; break; | ||
101 | case 4: vidc->control |= VIDC20_CTRL_PIX_CK4; break; | ||
102 | case 5: vidc->control |= VIDC20_CTRL_PIX_CK5; break; | ||
103 | case 6: vidc->control |= VIDC20_CTRL_PIX_CK6; break; | ||
104 | case 7: vidc->control |= VIDC20_CTRL_PIX_CK7; break; | ||
105 | case 8: vidc->control |= VIDC20_CTRL_PIX_CK8; break; | ||
106 | } | ||
107 | |||
108 | /* | ||
109 | * With VRAM, the FIFO can be set to the highest possible setting | ||
110 | * because there are no latency considerations for other memory | ||
111 | * accesses. However, in 64 bit bus mode the FIFO preload value | ||
112 | * must not be set to VIDC20_CTRL_FIFO_28 because this will let | ||
113 | * the FIFO overflow. See VIDC20 manual page 33 (6.0 Setting the | ||
114 | * FIFO preload value). | ||
115 | */ | ||
116 | if (current_par.using_vram) { | ||
117 | if (current_par.vram_half_sam == 2048) | ||
118 | vidc->control |= VIDC20_CTRL_FIFO_24; | ||
119 | else | ||
120 | vidc->control |= VIDC20_CTRL_FIFO_28; | ||
121 | } else { | ||
122 | unsigned long bandwidth = acornfb_bandwidth(var); | ||
123 | |||
124 | /* Encode bandwidth as VIDC20 setting */ | ||
125 | if (bandwidth > 33334) /* < 30.0MB/s */ | ||
126 | vidc->control |= VIDC20_CTRL_FIFO_16; | ||
127 | else if (bandwidth > 26666) /* < 37.5MB/s */ | ||
128 | vidc->control |= VIDC20_CTRL_FIFO_20; | ||
129 | else if (bandwidth > 22222) /* < 45.0MB/s */ | ||
130 | vidc->control |= VIDC20_CTRL_FIFO_24; | ||
131 | else /* > 45.0MB/s */ | ||
132 | vidc->control |= VIDC20_CTRL_FIFO_28; | ||
133 | } | ||
134 | |||
135 | /* Find the PLL values */ | ||
136 | vidc->pll_ctl = acornfb_vidc20_find_pll(var->pixclock / div); | ||
137 | } | ||
138 | |||
139 | #define acornfb_default_control() (VIDC20_CTRL_PIX_VCLK) | ||
140 | #define acornfb_default_econtrol() (VIDC20_ECTL_DAC | VIDC20_ECTL_REG(3)) | ||
diff --git a/arch/arm/mach-rpc/include/mach/debug-macro.S b/arch/arm/mach-rpc/include/mach/debug-macro.S new file mode 100644 index 00000000000..b2a939ffdcd --- /dev/null +++ b/arch/arm/mach-rpc/include/mach/debug-macro.S | |||
@@ -0,0 +1,25 @@ | |||
1 | /* arch/arm/mach-rpc/include/mach/debug-macro.S | ||
2 | * | ||
3 | * Debugging macro include header | ||
4 | * | ||
5 | * Copyright (C) 1994-1999 Russell King | ||
6 | * Moved from linux/arch/arm/kernel/debug.S by Ben Dooks | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | * | ||
12 | */ | ||
13 | |||
14 | .macro addruart,rx | ||
15 | mrc p15, 0, \rx, c1, c0 | ||
16 | tst \rx, #1 @ MMU enabled? | ||
17 | moveq \rx, #0x03000000 | ||
18 | movne \rx, #0xe0000000 | ||
19 | orr \rx, \rx, #0x00010000 | ||
20 | orr \rx, \rx, #0x00000fe0 | ||
21 | .endm | ||
22 | |||
23 | #define UART_SHIFT 2 | ||
24 | #define FLOW_CONTROL | ||
25 | #include <asm/hardware/debug-8250.S> | ||
diff --git a/arch/arm/mach-rpc/include/mach/dma.h b/arch/arm/mach-rpc/include/mach/dma.h new file mode 100644 index 00000000000..360b56f8f29 --- /dev/null +++ b/arch/arm/mach-rpc/include/mach/dma.h | |||
@@ -0,0 +1,33 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-rpc/include/mach/dma.h | ||
3 | * | ||
4 | * Copyright (C) 1997 Russell King | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | */ | ||
10 | #ifndef __ASM_ARCH_DMA_H | ||
11 | #define __ASM_ARCH_DMA_H | ||
12 | |||
13 | /* | ||
14 | * This is the maximum DMA address that can be DMAd to. | ||
15 | * There should not be more than (0xd0000000 - 0xc0000000) | ||
16 | * bytes of RAM. | ||
17 | */ | ||
18 | #define MAX_DMA_ADDRESS 0xd0000000 | ||
19 | #define MAX_DMA_CHANNELS 8 | ||
20 | |||
21 | #define DMA_0 0 | ||
22 | #define DMA_1 1 | ||
23 | #define DMA_2 2 | ||
24 | #define DMA_3 3 | ||
25 | #define DMA_S0 4 | ||
26 | #define DMA_S1 5 | ||
27 | #define DMA_VIRTUAL_FLOPPY 6 | ||
28 | #define DMA_VIRTUAL_SOUND 7 | ||
29 | |||
30 | #define DMA_FLOPPY DMA_VIRTUAL_FLOPPY | ||
31 | |||
32 | #endif /* _ASM_ARCH_DMA_H */ | ||
33 | |||
diff --git a/arch/arm/mach-rpc/include/mach/entry-macro.S b/arch/arm/mach-rpc/include/mach/entry-macro.S new file mode 100644 index 00000000000..4e7e5414409 --- /dev/null +++ b/arch/arm/mach-rpc/include/mach/entry-macro.S | |||
@@ -0,0 +1,16 @@ | |||
1 | #include <mach/hardware.h> | ||
2 | #include <asm/hardware/entry-macro-iomd.S> | ||
3 | |||
4 | .equ ioc_base_high, IOC_BASE & 0xff000000 | ||
5 | .equ ioc_base_low, IOC_BASE & 0x00ff0000 | ||
6 | |||
7 | .macro get_irqnr_preamble, base, tmp | ||
8 | mov \base, #ioc_base_high @ point at IOC | ||
9 | .if ioc_base_low | ||
10 | orr \base, \base, #ioc_base_low | ||
11 | .endif | ||
12 | .endm | ||
13 | |||
14 | .macro arch_ret_to_user, tmp1, tmp2 | ||
15 | .endm | ||
16 | |||
diff --git a/arch/arm/mach-rpc/include/mach/hardware.h b/arch/arm/mach-rpc/include/mach/hardware.h new file mode 100644 index 00000000000..dde6b3c0e29 --- /dev/null +++ b/arch/arm/mach-rpc/include/mach/hardware.h | |||
@@ -0,0 +1,83 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-rpc/include/mach/hardware.h | ||
3 | * | ||
4 | * Copyright (C) 1996-1999 Russell King. | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | * | ||
10 | * This file contains the hardware definitions of the RiscPC series machines. | ||
11 | */ | ||
12 | #ifndef __ASM_ARCH_HARDWARE_H | ||
13 | #define __ASM_ARCH_HARDWARE_H | ||
14 | |||
15 | #include <mach/memory.h> | ||
16 | |||
17 | #ifndef __ASSEMBLY__ | ||
18 | #define IOMEM(x) ((void __iomem *)(unsigned long)(x)) | ||
19 | #else | ||
20 | #define IOMEM(x) x | ||
21 | #endif /* __ASSEMBLY__ */ | ||
22 | |||
23 | /* | ||
24 | * What hardware must be present | ||
25 | */ | ||
26 | #define HAS_IOMD | ||
27 | #define HAS_VIDC20 | ||
28 | |||
29 | /* Hardware addresses of major areas. | ||
30 | * *_START is the physical address | ||
31 | * *_SIZE is the size of the region | ||
32 | * *_BASE is the virtual address | ||
33 | */ | ||
34 | #define RAM_SIZE 0x10000000 | ||
35 | #define RAM_START 0x10000000 | ||
36 | |||
37 | #define EASI_SIZE 0x08000000 /* EASI I/O */ | ||
38 | #define EASI_START 0x08000000 | ||
39 | #define EASI_BASE 0xe5000000 | ||
40 | |||
41 | #define IO_START 0x03000000 /* I/O */ | ||
42 | #define IO_SIZE 0x01000000 | ||
43 | #define IO_BASE IOMEM(0xe0000000) | ||
44 | |||
45 | #define SCREEN_START 0x02000000 /* VRAM */ | ||
46 | #define SCREEN_END 0xdfc00000 | ||
47 | #define SCREEN_BASE 0xdf800000 | ||
48 | |||
49 | #define UNCACHEABLE_ADDR 0xdf010000 | ||
50 | |||
51 | /* | ||
52 | * IO Addresses | ||
53 | */ | ||
54 | #define VIDC_BASE IOMEM(0xe0400000) | ||
55 | #define EXPMASK_BASE 0xe0360000 | ||
56 | #define IOMD_BASE IOMEM(0xe0200000) | ||
57 | #define IOC_BASE IOMEM(0xe0200000) | ||
58 | #define PCIO_BASE IOMEM(0xe0010000) | ||
59 | #define FLOPPYDMA_BASE IOMEM(0xe002a000) | ||
60 | |||
61 | #define vidc_writel(val) __raw_writel(val, VIDC_BASE) | ||
62 | |||
63 | #define IO_EC_EASI_BASE 0x81400000 | ||
64 | #define IO_EC_IOC4_BASE 0x8009c000 | ||
65 | #define IO_EC_IOC_BASE 0x80090000 | ||
66 | #define IO_EC_MEMC8_BASE 0x8000ac00 | ||
67 | #define IO_EC_MEMC_BASE 0x80000000 | ||
68 | |||
69 | #define NETSLOT_BASE 0x0302b000 | ||
70 | #define NETSLOT_SIZE 0x00001000 | ||
71 | |||
72 | #define PODSLOT_IOC0_BASE 0x03240000 | ||
73 | #define PODSLOT_IOC4_BASE 0x03270000 | ||
74 | #define PODSLOT_IOC_SIZE (1 << 14) | ||
75 | #define PODSLOT_MEMC_BASE 0x03000000 | ||
76 | #define PODSLOT_MEMC_SIZE (1 << 14) | ||
77 | #define PODSLOT_EASI_BASE 0x08000000 | ||
78 | #define PODSLOT_EASI_SIZE (1 << 24) | ||
79 | |||
80 | #define EXPMASK_STATUS (EXPMASK_BASE + 0x00) | ||
81 | #define EXPMASK_ENABLE (EXPMASK_BASE + 0x04) | ||
82 | |||
83 | #endif | ||
diff --git a/arch/arm/mach-rpc/include/mach/io.h b/arch/arm/mach-rpc/include/mach/io.h new file mode 100644 index 00000000000..9f0553b7ec2 --- /dev/null +++ b/arch/arm/mach-rpc/include/mach/io.h | |||
@@ -0,0 +1,258 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-rpc/include/mach/io.h | ||
3 | * | ||
4 | * Copyright (C) 1997 Russell King | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | * | ||
10 | * Modifications: | ||
11 | * 06-Dec-1997 RMK Created. | ||
12 | */ | ||
13 | #ifndef __ASM_ARM_ARCH_IO_H | ||
14 | #define __ASM_ARM_ARCH_IO_H | ||
15 | |||
16 | #include <mach/hardware.h> | ||
17 | |||
18 | #define IO_SPACE_LIMIT 0xffffffff | ||
19 | |||
20 | /* | ||
21 | * GCC is totally crap at loading/storing data. We try to persuade it | ||
22 | * to do the right thing by using these whereever possible instead of | ||
23 | * the above. | ||
24 | */ | ||
25 | #define __arch_base_getb(b,o) \ | ||
26 | ({ \ | ||
27 | unsigned int __v, __r = (b); \ | ||
28 | __asm__ __volatile__( \ | ||
29 | "ldrb %0, [%1, %2]" \ | ||
30 | : "=r" (__v) \ | ||
31 | : "r" (__r), "Ir" (o)); \ | ||
32 | __v; \ | ||
33 | }) | ||
34 | |||
35 | #define __arch_base_getl(b,o) \ | ||
36 | ({ \ | ||
37 | unsigned int __v, __r = (b); \ | ||
38 | __asm__ __volatile__( \ | ||
39 | "ldr %0, [%1, %2]" \ | ||
40 | : "=r" (__v) \ | ||
41 | : "r" (__r), "Ir" (o)); \ | ||
42 | __v; \ | ||
43 | }) | ||
44 | |||
45 | #define __arch_base_putb(v,b,o) \ | ||
46 | ({ \ | ||
47 | unsigned int __r = (b); \ | ||
48 | __asm__ __volatile__( \ | ||
49 | "strb %0, [%1, %2]" \ | ||
50 | : \ | ||
51 | : "r" (v), "r" (__r), "Ir" (o));\ | ||
52 | }) | ||
53 | |||
54 | #define __arch_base_putl(v,b,o) \ | ||
55 | ({ \ | ||
56 | unsigned int __r = (b); \ | ||
57 | __asm__ __volatile__( \ | ||
58 | "str %0, [%1, %2]" \ | ||
59 | : \ | ||
60 | : "r" (v), "r" (__r), "Ir" (o));\ | ||
61 | }) | ||
62 | |||
63 | /* | ||
64 | * We use two different types of addressing - PC style addresses, and ARM | ||
65 | * addresses. PC style accesses the PC hardware with the normal PC IO | ||
66 | * addresses, eg 0x3f8 for serial#1. ARM addresses are 0x80000000+ | ||
67 | * and are translated to the start of IO. Note that all addresses are | ||
68 | * shifted left! | ||
69 | */ | ||
70 | #define __PORT_PCIO(x) (!((x) & 0x80000000)) | ||
71 | |||
72 | /* | ||
73 | * Dynamic IO functions. | ||
74 | */ | ||
75 | static inline void __outb (unsigned int value, unsigned int port) | ||
76 | { | ||
77 | unsigned long temp; | ||
78 | __asm__ __volatile__( | ||
79 | "tst %2, #0x80000000\n\t" | ||
80 | "mov %0, %4\n\t" | ||
81 | "addeq %0, %0, %3\n\t" | ||
82 | "strb %1, [%0, %2, lsl #2] @ outb" | ||
83 | : "=&r" (temp) | ||
84 | : "r" (value), "r" (port), "Ir" (PCIO_BASE - IO_BASE), "Ir" (IO_BASE) | ||
85 | : "cc"); | ||
86 | } | ||
87 | |||
88 | static inline void __outw (unsigned int value, unsigned int port) | ||
89 | { | ||
90 | unsigned long temp; | ||
91 | __asm__ __volatile__( | ||
92 | "tst %2, #0x80000000\n\t" | ||
93 | "mov %0, %4\n\t" | ||
94 | "addeq %0, %0, %3\n\t" | ||
95 | "str %1, [%0, %2, lsl #2] @ outw" | ||
96 | : "=&r" (temp) | ||
97 | : "r" (value|value<<16), "r" (port), "Ir" (PCIO_BASE - IO_BASE), "Ir" (IO_BASE) | ||
98 | : "cc"); | ||
99 | } | ||
100 | |||
101 | static inline void __outl (unsigned int value, unsigned int port) | ||
102 | { | ||
103 | unsigned long temp; | ||
104 | __asm__ __volatile__( | ||
105 | "tst %2, #0x80000000\n\t" | ||
106 | "mov %0, %4\n\t" | ||
107 | "addeq %0, %0, %3\n\t" | ||
108 | "str %1, [%0, %2, lsl #2] @ outl" | ||
109 | : "=&r" (temp) | ||
110 | : "r" (value), "r" (port), "Ir" (PCIO_BASE - IO_BASE), "Ir" (IO_BASE) | ||
111 | : "cc"); | ||
112 | } | ||
113 | |||
114 | #define DECLARE_DYN_IN(sz,fnsuffix,instr) \ | ||
115 | static inline unsigned sz __in##fnsuffix (unsigned int port) \ | ||
116 | { \ | ||
117 | unsigned long temp, value; \ | ||
118 | __asm__ __volatile__( \ | ||
119 | "tst %2, #0x80000000\n\t" \ | ||
120 | "mov %0, %4\n\t" \ | ||
121 | "addeq %0, %0, %3\n\t" \ | ||
122 | "ldr" instr " %1, [%0, %2, lsl #2] @ in" #fnsuffix \ | ||
123 | : "=&r" (temp), "=r" (value) \ | ||
124 | : "r" (port), "Ir" (PCIO_BASE - IO_BASE), "Ir" (IO_BASE) \ | ||
125 | : "cc"); \ | ||
126 | return (unsigned sz)value; \ | ||
127 | } | ||
128 | |||
129 | static inline void __iomem *__deprecated __ioaddr(unsigned int port) | ||
130 | { | ||
131 | void __iomem *ret; | ||
132 | if (__PORT_PCIO(port)) | ||
133 | ret = PCIO_BASE; | ||
134 | else | ||
135 | ret = IO_BASE; | ||
136 | return ret + (port << 2); | ||
137 | } | ||
138 | |||
139 | #define DECLARE_IO(sz,fnsuffix,instr) \ | ||
140 | DECLARE_DYN_IN(sz,fnsuffix,instr) | ||
141 | |||
142 | DECLARE_IO(char,b,"b") | ||
143 | DECLARE_IO(short,w,"") | ||
144 | DECLARE_IO(int,l,"") | ||
145 | |||
146 | #undef DECLARE_IO | ||
147 | #undef DECLARE_DYN_IN | ||
148 | |||
149 | /* | ||
150 | * Constant address IO functions | ||
151 | * | ||
152 | * These have to be macros for the 'J' constraint to work - | ||
153 | * +/-4096 immediate operand. | ||
154 | */ | ||
155 | #define __outbc(value,port) \ | ||
156 | ({ \ | ||
157 | if (__PORT_PCIO((port))) \ | ||
158 | __asm__ __volatile__( \ | ||
159 | "strb %0, [%1, %2] @ outbc" \ | ||
160 | : : "r" (value), "r" (PCIO_BASE), "Jr" ((port) << 2)); \ | ||
161 | else \ | ||
162 | __asm__ __volatile__( \ | ||
163 | "strb %0, [%1, %2] @ outbc" \ | ||
164 | : : "r" (value), "r" (IO_BASE), "r" ((port) << 2)); \ | ||
165 | }) | ||
166 | |||
167 | #define __inbc(port) \ | ||
168 | ({ \ | ||
169 | unsigned char result; \ | ||
170 | if (__PORT_PCIO((port))) \ | ||
171 | __asm__ __volatile__( \ | ||
172 | "ldrb %0, [%1, %2] @ inbc" \ | ||
173 | : "=r" (result) : "r" (PCIO_BASE), "Jr" ((port) << 2)); \ | ||
174 | else \ | ||
175 | __asm__ __volatile__( \ | ||
176 | "ldrb %0, [%1, %2] @ inbc" \ | ||
177 | : "=r" (result) : "r" (IO_BASE), "r" ((port) << 2)); \ | ||
178 | result; \ | ||
179 | }) | ||
180 | |||
181 | #define __outwc(value,port) \ | ||
182 | ({ \ | ||
183 | unsigned long __v = value; \ | ||
184 | if (__PORT_PCIO((port))) \ | ||
185 | __asm__ __volatile__( \ | ||
186 | "str %0, [%1, %2] @ outwc" \ | ||
187 | : : "r" (__v|__v<<16), "r" (PCIO_BASE), "Jr" ((port) << 2)); \ | ||
188 | else \ | ||
189 | __asm__ __volatile__( \ | ||
190 | "str %0, [%1, %2] @ outwc" \ | ||
191 | : : "r" (__v|__v<<16), "r" (IO_BASE), "r" ((port) << 2)); \ | ||
192 | }) | ||
193 | |||
194 | #define __inwc(port) \ | ||
195 | ({ \ | ||
196 | unsigned short result; \ | ||
197 | if (__PORT_PCIO((port))) \ | ||
198 | __asm__ __volatile__( \ | ||
199 | "ldr %0, [%1, %2] @ inwc" \ | ||
200 | : "=r" (result) : "r" (PCIO_BASE), "Jr" ((port) << 2)); \ | ||
201 | else \ | ||
202 | __asm__ __volatile__( \ | ||
203 | "ldr %0, [%1, %2] @ inwc" \ | ||
204 | : "=r" (result) : "r" (IO_BASE), "r" ((port) << 2)); \ | ||
205 | result & 0xffff; \ | ||
206 | }) | ||
207 | |||
208 | #define __outlc(value,port) \ | ||
209 | ({ \ | ||
210 | unsigned long __v = value; \ | ||
211 | if (__PORT_PCIO((port))) \ | ||
212 | __asm__ __volatile__( \ | ||
213 | "str %0, [%1, %2] @ outlc" \ | ||
214 | : : "r" (__v), "r" (PCIO_BASE), "Jr" ((port) << 2)); \ | ||
215 | else \ | ||
216 | __asm__ __volatile__( \ | ||
217 | "str %0, [%1, %2] @ outlc" \ | ||
218 | : : "r" (__v), "r" (IO_BASE), "r" ((port) << 2)); \ | ||
219 | }) | ||
220 | |||
221 | #define __inlc(port) \ | ||
222 | ({ \ | ||
223 | unsigned long result; \ | ||
224 | if (__PORT_PCIO((port))) \ | ||
225 | __asm__ __volatile__( \ | ||
226 | "ldr %0, [%1, %2] @ inlc" \ | ||
227 | : "=r" (result) : "r" (PCIO_BASE), "Jr" ((port) << 2)); \ | ||
228 | else \ | ||
229 | __asm__ __volatile__( \ | ||
230 | "ldr %0, [%1, %2] @ inlc" \ | ||
231 | : "=r" (result) : "r" (IO_BASE), "r" ((port) << 2)); \ | ||
232 | result; \ | ||
233 | }) | ||
234 | |||
235 | #define __ioaddrc(port) __ioaddr(port) | ||
236 | |||
237 | #define inb(p) (__builtin_constant_p((p)) ? __inbc(p) : __inb(p)) | ||
238 | #define inw(p) (__builtin_constant_p((p)) ? __inwc(p) : __inw(p)) | ||
239 | #define inl(p) (__builtin_constant_p((p)) ? __inlc(p) : __inl(p)) | ||
240 | #define outb(v,p) (__builtin_constant_p((p)) ? __outbc(v,p) : __outb(v,p)) | ||
241 | #define outw(v,p) (__builtin_constant_p((p)) ? __outwc(v,p) : __outw(v,p)) | ||
242 | #define outl(v,p) (__builtin_constant_p((p)) ? __outlc(v,p) : __outl(v,p)) | ||
243 | #define __ioaddr(p) (__builtin_constant_p((p)) ? __ioaddr(p) : __ioaddrc(p)) | ||
244 | /* the following macro is deprecated */ | ||
245 | #define ioaddr(port) ((unsigned long)__ioaddr((port))) | ||
246 | |||
247 | #define insb(p,d,l) __raw_readsb(__ioaddr(p),d,l) | ||
248 | #define insw(p,d,l) __raw_readsw(__ioaddr(p),d,l) | ||
249 | |||
250 | #define outsb(p,d,l) __raw_writesb(__ioaddr(p),d,l) | ||
251 | #define outsw(p,d,l) __raw_writesw(__ioaddr(p),d,l) | ||
252 | |||
253 | /* | ||
254 | * 1:1 mapping for ioremapped regions. | ||
255 | */ | ||
256 | #define __mem_pci(x) (x) | ||
257 | |||
258 | #endif | ||
diff --git a/arch/arm/mach-rpc/include/mach/irqs.h b/arch/arm/mach-rpc/include/mach/irqs.h new file mode 100644 index 00000000000..4ce6ca97f66 --- /dev/null +++ b/arch/arm/mach-rpc/include/mach/irqs.h | |||
@@ -0,0 +1,46 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-rpc/include/mach/irqs.h | ||
3 | * | ||
4 | * Copyright (C) 1996 Russell King | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | */ | ||
10 | |||
11 | #define IRQ_PRINTER 0 | ||
12 | #define IRQ_BATLOW 1 | ||
13 | #define IRQ_FLOPPYINDEX 2 | ||
14 | #define IRQ_VSYNCPULSE 3 | ||
15 | #define IRQ_POWERON 4 | ||
16 | #define IRQ_TIMER0 5 | ||
17 | #define IRQ_TIMER1 6 | ||
18 | #define IRQ_IMMEDIATE 7 | ||
19 | #define IRQ_EXPCARDFIQ 8 | ||
20 | #define IRQ_HARDDISK 9 | ||
21 | #define IRQ_SERIALPORT 10 | ||
22 | #define IRQ_FLOPPYDISK 12 | ||
23 | #define IRQ_EXPANSIONCARD 13 | ||
24 | #define IRQ_KEYBOARDTX 14 | ||
25 | #define IRQ_KEYBOARDRX 15 | ||
26 | |||
27 | #define IRQ_DMA0 16 | ||
28 | #define IRQ_DMA1 17 | ||
29 | #define IRQ_DMA2 18 | ||
30 | #define IRQ_DMA3 19 | ||
31 | #define IRQ_DMAS0 20 | ||
32 | #define IRQ_DMAS1 21 | ||
33 | |||
34 | #define FIQ_FLOPPYDATA 0 | ||
35 | #define FIQ_ECONET 2 | ||
36 | #define FIQ_SERIALPORT 4 | ||
37 | #define FIQ_EXPANSIONCARD 6 | ||
38 | #define FIQ_FORCE 7 | ||
39 | |||
40 | /* | ||
41 | * This is the offset of the FIQ "IRQ" numbers | ||
42 | */ | ||
43 | #define FIQ_START 64 | ||
44 | |||
45 | #define IRQ_TIMER IRQ_TIMER0 | ||
46 | |||
diff --git a/arch/arm/mach-rpc/include/mach/memory.h b/arch/arm/mach-rpc/include/mach/memory.h new file mode 100644 index 00000000000..05425d558ee --- /dev/null +++ b/arch/arm/mach-rpc/include/mach/memory.h | |||
@@ -0,0 +1,39 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-rpc/include/mach/memory.h | ||
3 | * | ||
4 | * Copyright (C) 1996,1997,1998 Russell King. | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | * | ||
10 | * Changelog: | ||
11 | * 20-Oct-1996 RMK Created | ||
12 | * 31-Dec-1997 RMK Fixed definitions to reduce warnings | ||
13 | * 11-Jan-1998 RMK Uninlined to reduce hits on cache | ||
14 | * 08-Feb-1998 RMK Added __virt_to_bus and __bus_to_virt | ||
15 | * 21-Mar-1999 RMK Renamed to memory.h | ||
16 | * RMK Added TASK_SIZE and PAGE_OFFSET | ||
17 | */ | ||
18 | #ifndef __ASM_ARCH_MEMORY_H | ||
19 | #define __ASM_ARCH_MEMORY_H | ||
20 | |||
21 | /* | ||
22 | * Physical DRAM offset. | ||
23 | */ | ||
24 | #define PHYS_OFFSET UL(0x10000000) | ||
25 | |||
26 | /* | ||
27 | * These are exactly the same on the RiscPC as the | ||
28 | * physical memory view. | ||
29 | */ | ||
30 | #define __virt_to_bus(x) __virt_to_phys(x) | ||
31 | #define __bus_to_virt(x) __phys_to_virt(x) | ||
32 | |||
33 | /* | ||
34 | * Cache flushing area - ROM | ||
35 | */ | ||
36 | #define FLUSH_BASE_PHYS 0x00000000 | ||
37 | #define FLUSH_BASE 0xdf000000 | ||
38 | |||
39 | #endif | ||
diff --git a/arch/arm/mach-rpc/include/mach/system.h b/arch/arm/mach-rpc/include/mach/system.h new file mode 100644 index 00000000000..54d6e3f2d31 --- /dev/null +++ b/arch/arm/mach-rpc/include/mach/system.h | |||
@@ -0,0 +1,27 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-rpc/include/mach/system.h | ||
3 | * | ||
4 | * Copyright (C) 1996-1999 Russell King. | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | */ | ||
10 | #include <mach/hardware.h> | ||
11 | #include <asm/hardware/iomd.h> | ||
12 | #include <asm/io.h> | ||
13 | |||
14 | static inline void arch_idle(void) | ||
15 | { | ||
16 | cpu_do_idle(); | ||
17 | } | ||
18 | |||
19 | static inline void arch_reset(char mode) | ||
20 | { | ||
21 | iomd_writeb(0, IOMD_ROMCR0); | ||
22 | |||
23 | /* | ||
24 | * Jump into the ROM | ||
25 | */ | ||
26 | cpu_reset(0); | ||
27 | } | ||
diff --git a/arch/arm/mach-rpc/include/mach/timex.h b/arch/arm/mach-rpc/include/mach/timex.h new file mode 100644 index 00000000000..dd75e7387bb --- /dev/null +++ b/arch/arm/mach-rpc/include/mach/timex.h | |||
@@ -0,0 +1,17 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-rpc/include/mach/timex.h | ||
3 | * | ||
4 | * Copyright (C) 1997, 1998 Russell King | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | * | ||
10 | * RiscPC architecture timex specifications | ||
11 | */ | ||
12 | |||
13 | /* | ||
14 | * On the RiscPC, the clock ticks at 2MHz. | ||
15 | */ | ||
16 | #define CLOCK_TICK_RATE 2000000 | ||
17 | |||
diff --git a/arch/arm/mach-rpc/include/mach/uncompress.h b/arch/arm/mach-rpc/include/mach/uncompress.h new file mode 100644 index 00000000000..baa9c866d7b --- /dev/null +++ b/arch/arm/mach-rpc/include/mach/uncompress.h | |||
@@ -0,0 +1,198 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-rpc/include/mach/uncompress.h | ||
3 | * | ||
4 | * Copyright (C) 1996 Russell King | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | */ | ||
10 | #define VIDMEM ((char *)SCREEN_START) | ||
11 | |||
12 | #include <mach/hardware.h> | ||
13 | #include <asm/io.h> | ||
14 | #include <asm/setup.h> | ||
15 | #include <asm/page.h> | ||
16 | |||
17 | int video_size_row; | ||
18 | unsigned char bytes_per_char_h; | ||
19 | extern unsigned long con_charconvtable[256]; | ||
20 | |||
21 | struct param_struct { | ||
22 | unsigned long page_size; | ||
23 | unsigned long nr_pages; | ||
24 | unsigned long ramdisk_size; | ||
25 | unsigned long mountrootrdonly; | ||
26 | unsigned long rootdev; | ||
27 | unsigned long video_num_cols; | ||
28 | unsigned long video_num_rows; | ||
29 | unsigned long video_x; | ||
30 | unsigned long video_y; | ||
31 | unsigned long memc_control_reg; | ||
32 | unsigned char sounddefault; | ||
33 | unsigned char adfsdrives; | ||
34 | unsigned char bytes_per_char_h; | ||
35 | unsigned char bytes_per_char_v; | ||
36 | unsigned long unused[256/4-11]; | ||
37 | }; | ||
38 | |||
39 | static const unsigned long palette_4[16] = { | ||
40 | 0x00000000, | ||
41 | 0x000000cc, | ||
42 | 0x0000cc00, /* Green */ | ||
43 | 0x0000cccc, /* Yellow */ | ||
44 | 0x00cc0000, /* Blue */ | ||
45 | 0x00cc00cc, /* Magenta */ | ||
46 | 0x00cccc00, /* Cyan */ | ||
47 | 0x00cccccc, /* White */ | ||
48 | 0x00000000, | ||
49 | 0x000000ff, | ||
50 | 0x0000ff00, | ||
51 | 0x0000ffff, | ||
52 | 0x00ff0000, | ||
53 | 0x00ff00ff, | ||
54 | 0x00ffff00, | ||
55 | 0x00ffffff | ||
56 | }; | ||
57 | |||
58 | #define palette_setpixel(p) *(unsigned long *)(IO_START+0x00400000) = 0x10000000|((p) & 255) | ||
59 | #define palette_write(v) *(unsigned long *)(IO_START+0x00400000) = 0x00000000|((v) & 0x00ffffff) | ||
60 | |||
61 | /* | ||
62 | * params_phys is a linker defined symbol - see | ||
63 | * arch/arm/boot/compressed/Makefile | ||
64 | */ | ||
65 | extern __attribute__((pure)) struct param_struct *params(void); | ||
66 | #define params (params()) | ||
67 | |||
68 | #ifndef STANDALONE_DEBUG | ||
69 | static unsigned long video_num_cols; | ||
70 | static unsigned long video_num_rows; | ||
71 | static unsigned long video_x; | ||
72 | static unsigned long video_y; | ||
73 | static unsigned char bytes_per_char_v; | ||
74 | static int white; | ||
75 | |||
76 | /* | ||
77 | * This does not append a newline | ||
78 | */ | ||
79 | static void putc(int c) | ||
80 | { | ||
81 | extern void ll_write_char(char *, char c, char white); | ||
82 | int x,y; | ||
83 | char *ptr; | ||
84 | |||
85 | x = video_x; | ||
86 | y = video_y; | ||
87 | |||
88 | if (c == '\n') { | ||
89 | if (++y >= video_num_rows) | ||
90 | y--; | ||
91 | } else if (c == '\r') { | ||
92 | x = 0; | ||
93 | } else { | ||
94 | ptr = VIDMEM + ((y*video_num_cols*bytes_per_char_v+x)*bytes_per_char_h); | ||
95 | ll_write_char(ptr, c, white); | ||
96 | if (++x >= video_num_cols) { | ||
97 | x = 0; | ||
98 | if ( ++y >= video_num_rows ) { | ||
99 | y--; | ||
100 | } | ||
101 | } | ||
102 | } | ||
103 | |||
104 | video_x = x; | ||
105 | video_y = y; | ||
106 | } | ||
107 | |||
108 | static inline void flush(void) | ||
109 | { | ||
110 | } | ||
111 | |||
112 | static void error(char *x); | ||
113 | |||
114 | /* | ||
115 | * Setup for decompression | ||
116 | */ | ||
117 | static void arch_decomp_setup(void) | ||
118 | { | ||
119 | int i; | ||
120 | struct tag *t = (struct tag *)params; | ||
121 | unsigned int nr_pages = 0, page_size = PAGE_SIZE; | ||
122 | |||
123 | if (t->hdr.tag == ATAG_CORE) | ||
124 | { | ||
125 | for (; t->hdr.size; t = tag_next(t)) | ||
126 | { | ||
127 | if (t->hdr.tag == ATAG_VIDEOTEXT) | ||
128 | { | ||
129 | video_num_rows = t->u.videotext.video_lines; | ||
130 | video_num_cols = t->u.videotext.video_cols; | ||
131 | bytes_per_char_h = t->u.videotext.video_points; | ||
132 | bytes_per_char_v = t->u.videotext.video_points; | ||
133 | video_x = t->u.videotext.x; | ||
134 | video_y = t->u.videotext.y; | ||
135 | } | ||
136 | |||
137 | if (t->hdr.tag == ATAG_MEM) | ||
138 | { | ||
139 | page_size = PAGE_SIZE; | ||
140 | nr_pages += (t->u.mem.size / PAGE_SIZE); | ||
141 | } | ||
142 | } | ||
143 | } | ||
144 | else | ||
145 | { | ||
146 | nr_pages = params->nr_pages; | ||
147 | page_size = params->page_size; | ||
148 | video_num_rows = params->video_num_rows; | ||
149 | video_num_cols = params->video_num_cols; | ||
150 | video_x = params->video_x; | ||
151 | video_y = params->video_y; | ||
152 | bytes_per_char_h = params->bytes_per_char_h; | ||
153 | bytes_per_char_v = params->bytes_per_char_v; | ||
154 | } | ||
155 | |||
156 | video_size_row = video_num_cols * bytes_per_char_h; | ||
157 | |||
158 | if (bytes_per_char_h == 4) | ||
159 | for (i = 0; i < 256; i++) | ||
160 | con_charconvtable[i] = | ||
161 | (i & 128 ? 1 << 0 : 0) | | ||
162 | (i & 64 ? 1 << 4 : 0) | | ||
163 | (i & 32 ? 1 << 8 : 0) | | ||
164 | (i & 16 ? 1 << 12 : 0) | | ||
165 | (i & 8 ? 1 << 16 : 0) | | ||
166 | (i & 4 ? 1 << 20 : 0) | | ||
167 | (i & 2 ? 1 << 24 : 0) | | ||
168 | (i & 1 ? 1 << 28 : 0); | ||
169 | else | ||
170 | for (i = 0; i < 16; i++) | ||
171 | con_charconvtable[i] = | ||
172 | (i & 8 ? 1 << 0 : 0) | | ||
173 | (i & 4 ? 1 << 8 : 0) | | ||
174 | (i & 2 ? 1 << 16 : 0) | | ||
175 | (i & 1 ? 1 << 24 : 0); | ||
176 | |||
177 | |||
178 | palette_setpixel(0); | ||
179 | if (bytes_per_char_h == 1) { | ||
180 | palette_write (0); | ||
181 | palette_write (0x00ffffff); | ||
182 | for (i = 2; i < 256; i++) | ||
183 | palette_write (0); | ||
184 | white = 1; | ||
185 | } else { | ||
186 | for (i = 0; i < 256; i++) | ||
187 | palette_write (i < 16 ? palette_4[i] : 0); | ||
188 | white = 7; | ||
189 | } | ||
190 | |||
191 | if (nr_pages * page_size < 4096*1024) error("<4M of mem\n"); | ||
192 | } | ||
193 | #endif | ||
194 | |||
195 | /* | ||
196 | * nothing to do | ||
197 | */ | ||
198 | #define arch_decomp_wdog() | ||
diff --git a/arch/arm/mach-rpc/include/mach/vmalloc.h b/arch/arm/mach-rpc/include/mach/vmalloc.h new file mode 100644 index 00000000000..9a96fd69e70 --- /dev/null +++ b/arch/arm/mach-rpc/include/mach/vmalloc.h | |||
@@ -0,0 +1,10 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-rpc/include/mach/vmalloc.h | ||
3 | * | ||
4 | * Copyright (C) 1997 Russell King | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | */ | ||
10 | #define VMALLOC_END (PAGE_OFFSET + 0x1c000000) | ||
diff --git a/arch/arm/mach-rpc/riscpc.c b/arch/arm/mach-rpc/riscpc.c index 54a6c756584..ce8470fea88 100644 --- a/arch/arm/mach-rpc/riscpc.c +++ b/arch/arm/mach-rpc/riscpc.c | |||
@@ -22,7 +22,7 @@ | |||
22 | #include <asm/elf.h> | 22 | #include <asm/elf.h> |
23 | #include <asm/io.h> | 23 | #include <asm/io.h> |
24 | #include <asm/mach-types.h> | 24 | #include <asm/mach-types.h> |
25 | #include <asm/arch/hardware.h> | 25 | #include <mach/hardware.h> |
26 | #include <asm/page.h> | 26 | #include <asm/page.h> |
27 | #include <asm/domain.h> | 27 | #include <asm/domain.h> |
28 | #include <asm/setup.h> | 28 | #include <asm/setup.h> |