diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2006-06-04 18:14:05 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2006-06-19 12:39:20 -0400 |
commit | 5e46c3aefe60d1398488410a0c39b4cd87738614 (patch) | |
tree | 982f9820e63cee8aacc4a6132f124d1cef4fe901 /arch/mips/sni/setup.c | |
parent | cbb306962ec4b30e03423137e22d605281a8f598 (diff) |
[MIPS] C99-ify struct resource initialization.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/sni/setup.c')
-rw-r--r-- | arch/mips/sni/setup.c | 126 |
1 files changed, 105 insertions, 21 deletions
diff --git a/arch/mips/sni/setup.c b/arch/mips/sni/setup.c index 01ba6c581e3d..c33cb9d1e18d 100644 --- a/arch/mips/sni/setup.c +++ b/arch/mips/sni/setup.c | |||
@@ -92,20 +92,51 @@ static void __init sni_display_setup(void) | |||
92 | } | 92 | } |
93 | 93 | ||
94 | static struct resource sni_io_resource = { | 94 | static struct resource sni_io_resource = { |
95 | "PCIMT IO MEM", 0x00001000UL, 0x03bfffffUL, IORESOURCE_IO, | 95 | .start = 0x00001000UL, |
96 | .end = 0x03bfffffUL, | ||
97 | .name = "PCIMT IO MEM", | ||
98 | .flags = IORESOURCE_IO, | ||
96 | }; | 99 | }; |
97 | 100 | ||
98 | static struct resource pcimt_io_resources[] = { | 101 | static struct resource pcimt_io_resources[] = { |
99 | { "dma1", 0x00, 0x1f, IORESOURCE_BUSY }, | 102 | { |
100 | { "timer", 0x40, 0x5f, IORESOURCE_BUSY }, | 103 | .start = 0x00, |
101 | { "keyboard", 0x60, 0x6f, IORESOURCE_BUSY }, | 104 | .end = 0x1f, |
102 | { "dma page reg", 0x80, 0x8f, IORESOURCE_BUSY }, | 105 | .name = "dma1", |
103 | { "dma2", 0xc0, 0xdf, IORESOURCE_BUSY }, | 106 | .flags = IORESOURCE_BUSY |
104 | { "PCI config data", 0xcfc, 0xcff, IORESOURCE_BUSY } | 107 | }, { |
108 | .start = 0x40, | ||
109 | .end = 0x5f, | ||
110 | .name = "timer", | ||
111 | .flags = IORESOURCE_BUSY | ||
112 | }, { | ||
113 | .start = 0x60, | ||
114 | .end = 0x6f, | ||
115 | .name = "keyboard", | ||
116 | .flags = IORESOURCE_BUSY | ||
117 | }, { | ||
118 | .start = 0x80, | ||
119 | .end = 0x8f, | ||
120 | .name = "dma page reg", | ||
121 | .flags = IORESOURCE_BUSY | ||
122 | }, { | ||
123 | .start = 0xc0, | ||
124 | .end = 0xdf, | ||
125 | .name = "dma2", | ||
126 | .flags = IORESOURCE_BUSY | ||
127 | }, { | ||
128 | .start = 0xcfc, | ||
129 | .end = 0xcff, | ||
130 | .name = "PCI config data", | ||
131 | .flags = IORESOURCE_BUSY | ||
132 | } | ||
105 | }; | 133 | }; |
106 | 134 | ||
107 | static struct resource sni_mem_resource = { | 135 | static struct resource sni_mem_resource = { |
108 | "PCIMT PCI MEM", 0x10000000UL, 0xffffffffUL, IORESOURCE_MEM | 136 | .start = 0x10000000UL, |
137 | .end = 0xffffffffUL, | ||
138 | .name = "PCIMT PCI MEM", | ||
139 | .flags = IORESOURCE_MEM | ||
109 | }; | 140 | }; |
110 | 141 | ||
111 | /* | 142 | /* |
@@ -122,19 +153,72 @@ static struct resource sni_mem_resource = { | |||
122 | * 0xa0000000 - 0xffffffff (1.5GB) PCI/EISA Bus Memory | 153 | * 0xa0000000 - 0xffffffff (1.5GB) PCI/EISA Bus Memory |
123 | */ | 154 | */ |
124 | static struct resource pcimt_mem_resources[] = { | 155 | static struct resource pcimt_mem_resources[] = { |
125 | { "Video RAM area", 0x100a0000, 0x100bffff, IORESOURCE_BUSY }, | 156 | { |
126 | { "ISA Reserved", 0x100c0000, 0x100fffff, IORESOURCE_BUSY }, | 157 | .start = 0x100a0000, |
127 | { "PCI IO", 0x14000000, 0x17bfffff, IORESOURCE_BUSY }, | 158 | .end = 0x100bffff, |
128 | { "Cache Replacement Area", 0x17c00000, 0x17ffffff, IORESOURCE_BUSY}, | 159 | .name = "Video RAM area", |
129 | { "PCI INT Acknowledge", 0x1a000000, 0x1a000003, IORESOURCE_BUSY }, | 160 | .flags = IORESOURCE_BUSY |
130 | { "Boot PROM", 0x1fc00000, 0x1fc7ffff, IORESOURCE_BUSY}, | 161 | }, { |
131 | { "Diag PROM", 0x1fc80000, 0x1fcfffff, IORESOURCE_BUSY}, | 162 | .start = 0x100c0000, |
132 | { "X-Bus", 0x1fd00000, 0x1fdfffff, IORESOURCE_BUSY}, | 163 | .end = 0x100fffff, |
133 | { "BIOS map", 0x1fe00000, 0x1fefffff, IORESOURCE_BUSY}, | 164 | .name = "ISA Reserved", |
134 | { "NVRAM / EEPROM", 0x1ff00000, 0x1ff7ffff, IORESOURCE_BUSY}, | 165 | .flags = IORESOURCE_BUSY |
135 | { "ASIC PCI", 0x1fff0000, 0x1fffefff, IORESOURCE_BUSY}, | 166 | }, { |
136 | { "MP Agent", 0x1ffff000, 0x1fffffff, IORESOURCE_BUSY}, | 167 | .start = 0x14000000, |
137 | { "Main Memory", 0x20000000, 0x9fffffff, IORESOURCE_BUSY} | 168 | .end = 0x17bfffff, |
169 | .name = "PCI IO", | ||
170 | .flags = IORESOURCE_BUSY | ||
171 | }, { | ||
172 | .start = 0x17c00000, | ||
173 | .end = 0x17ffffff, | ||
174 | .name = "Cache Replacement Area", | ||
175 | .flags = IORESOURCE_BUSY | ||
176 | }, { | ||
177 | .start = 0x1a000000, | ||
178 | .end = 0x1a000003, | ||
179 | .name = "PCI INT Acknowledge", | ||
180 | .flags = IORESOURCE_BUSY | ||
181 | }, { | ||
182 | .start = 0x1fc00000, | ||
183 | .end = 0x1fc7ffff, | ||
184 | .name = "Boot PROM", | ||
185 | .flags = IORESOURCE_BUSY | ||
186 | }, { | ||
187 | .start = 0x1fc80000, | ||
188 | .end = 0x1fcfffff, | ||
189 | .name = "Diag PROM", | ||
190 | .flags = IORESOURCE_BUSY | ||
191 | }, { | ||
192 | .start = 0x1fd00000, | ||
193 | .end = 0x1fdfffff, | ||
194 | .name = "X-Bus", | ||
195 | .flags = IORESOURCE_BUSY | ||
196 | }, { | ||
197 | .start = 0x1fe00000, | ||
198 | .end = 0x1fefffff, | ||
199 | .name = "BIOS map", | ||
200 | .flags = IORESOURCE_BUSY | ||
201 | }, { | ||
202 | .start = 0x1ff00000, | ||
203 | .end = 0x1ff7ffff, | ||
204 | .name = "NVRAM / EEPROM", | ||
205 | .flags = IORESOURCE_BUSY | ||
206 | }, { | ||
207 | .start = 0x1fff0000, | ||
208 | .end = 0x1fffefff, | ||
209 | .name = "ASIC PCI", | ||
210 | .flags = IORESOURCE_BUSY | ||
211 | }, { | ||
212 | .start = 0x1ffff000, | ||
213 | .end = 0x1fffffff, | ||
214 | .name = "MP Agent", | ||
215 | .flags = IORESOURCE_BUSY | ||
216 | }, { | ||
217 | .start = 0x20000000, | ||
218 | .end = 0x9fffffff, | ||
219 | .name = "Main Memory", | ||
220 | .flags = IORESOURCE_BUSY | ||
221 | } | ||
138 | }; | 222 | }; |
139 | 223 | ||
140 | static void __init sni_resource_init(void) | 224 | static void __init sni_resource_init(void) |