diff options
Diffstat (limited to 'arch/arm/mach-sa1100/generic.c')
-rw-r--r-- | arch/arm/mach-sa1100/generic.c | 41 |
1 files changed, 33 insertions, 8 deletions
diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c index fbc224d88e6f..59d14f0fdcf8 100644 --- a/arch/arm/mach-sa1100/generic.c +++ b/arch/arm/mach-sa1100/generic.c | |||
@@ -140,10 +140,15 @@ static void sa11x0_register_device(struct platform_device *dev, void *data) | |||
140 | 140 | ||
141 | static struct resource sa11x0udc_resources[] = { | 141 | static struct resource sa11x0udc_resources[] = { |
142 | [0] = { | 142 | [0] = { |
143 | .start = 0x80000000, | 143 | .start = __PREG(Ser0UDCCR), |
144 | .end = 0x8000ffff, | 144 | .end = __PREG(Ser0UDCCR) + 0xffff, |
145 | .flags = IORESOURCE_MEM, | 145 | .flags = IORESOURCE_MEM, |
146 | }, | 146 | }, |
147 | [1] = { | ||
148 | .start = IRQ_Ser0UDC, | ||
149 | .end = IRQ_Ser0UDC, | ||
150 | .flags = IORESOURCE_IRQ, | ||
151 | }, | ||
147 | }; | 152 | }; |
148 | 153 | ||
149 | static u64 sa11x0udc_dma_mask = 0xffffffffUL; | 154 | static u64 sa11x0udc_dma_mask = 0xffffffffUL; |
@@ -161,10 +166,15 @@ static struct platform_device sa11x0udc_device = { | |||
161 | 166 | ||
162 | static struct resource sa11x0uart1_resources[] = { | 167 | static struct resource sa11x0uart1_resources[] = { |
163 | [0] = { | 168 | [0] = { |
164 | .start = 0x80010000, | 169 | .start = __PREG(Ser1UTCR0), |
165 | .end = 0x8001ffff, | 170 | .end = __PREG(Ser1UTCR0) + 0xffff, |
166 | .flags = IORESOURCE_MEM, | 171 | .flags = IORESOURCE_MEM, |
167 | }, | 172 | }, |
173 | [1] = { | ||
174 | .start = IRQ_Ser1UART, | ||
175 | .end = IRQ_Ser1UART, | ||
176 | .flags = IORESOURCE_IRQ, | ||
177 | }, | ||
168 | }; | 178 | }; |
169 | 179 | ||
170 | static struct platform_device sa11x0uart1_device = { | 180 | static struct platform_device sa11x0uart1_device = { |
@@ -176,10 +186,15 @@ static struct platform_device sa11x0uart1_device = { | |||
176 | 186 | ||
177 | static struct resource sa11x0uart3_resources[] = { | 187 | static struct resource sa11x0uart3_resources[] = { |
178 | [0] = { | 188 | [0] = { |
179 | .start = 0x80050000, | 189 | .start = __PREG(Ser3UTCR0), |
180 | .end = 0x8005ffff, | 190 | .end = __PREG(Ser3UTCR0) + 0xffff, |
181 | .flags = IORESOURCE_MEM, | 191 | .flags = IORESOURCE_MEM, |
182 | }, | 192 | }, |
193 | [1] = { | ||
194 | .start = IRQ_Ser3UART, | ||
195 | .end = IRQ_Ser3UART, | ||
196 | .flags = IORESOURCE_IRQ, | ||
197 | }, | ||
183 | }; | 198 | }; |
184 | 199 | ||
185 | static struct platform_device sa11x0uart3_device = { | 200 | static struct platform_device sa11x0uart3_device = { |
@@ -191,10 +206,15 @@ static struct platform_device sa11x0uart3_device = { | |||
191 | 206 | ||
192 | static struct resource sa11x0mcp_resources[] = { | 207 | static struct resource sa11x0mcp_resources[] = { |
193 | [0] = { | 208 | [0] = { |
194 | .start = 0x80060000, | 209 | .start = __PREG(Ser4MCCR0), |
195 | .end = 0x8006ffff, | 210 | .end = __PREG(Ser4MCCR0) + 0xffff, |
196 | .flags = IORESOURCE_MEM, | 211 | .flags = IORESOURCE_MEM, |
197 | }, | 212 | }, |
213 | [1] = { | ||
214 | .start = IRQ_Ser4MCP, | ||
215 | .end = IRQ_Ser4MCP, | ||
216 | .flags = IORESOURCE_IRQ, | ||
217 | }, | ||
198 | }; | 218 | }; |
199 | 219 | ||
200 | static u64 sa11x0mcp_dma_mask = 0xffffffffUL; | 220 | static u64 sa11x0mcp_dma_mask = 0xffffffffUL; |
@@ -221,6 +241,11 @@ static struct resource sa11x0ssp_resources[] = { | |||
221 | .end = 0x8007ffff, | 241 | .end = 0x8007ffff, |
222 | .flags = IORESOURCE_MEM, | 242 | .flags = IORESOURCE_MEM, |
223 | }, | 243 | }, |
244 | [1] = { | ||
245 | .start = IRQ_Ser4SSP, | ||
246 | .end = IRQ_Ser4SSP, | ||
247 | .flags = IORESOURCE_IRQ, | ||
248 | }, | ||
224 | }; | 249 | }; |
225 | 250 | ||
226 | static u64 sa11x0ssp_dma_mask = 0xffffffffUL; | 251 | static u64 sa11x0ssp_dma_mask = 0xffffffffUL; |