diff options
Diffstat (limited to 'arch/blackfin/mach-bf537/boards/minotaur.c')
-rw-r--r-- | arch/blackfin/mach-bf537/boards/minotaur.c | 48 |
1 files changed, 41 insertions, 7 deletions
diff --git a/arch/blackfin/mach-bf537/boards/minotaur.c b/arch/blackfin/mach-bf537/boards/minotaur.c index 48c4cd2d1be6..bb795341cb17 100644 --- a/arch/blackfin/mach-bf537/boards/minotaur.c +++ b/arch/blackfin/mach-bf537/boards/minotaur.c | |||
@@ -226,30 +226,59 @@ static struct platform_device bfin_uart_device = { | |||
226 | #endif | 226 | #endif |
227 | 227 | ||
228 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) | 228 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) |
229 | static struct resource bfin_sir_resources[] = { | ||
230 | #ifdef CONFIG_BFIN_SIR0 | 229 | #ifdef CONFIG_BFIN_SIR0 |
230 | static struct resource bfin_sir0_resources[] = { | ||
231 | { | 231 | { |
232 | .start = 0xFFC00400, | 232 | .start = 0xFFC00400, |
233 | .end = 0xFFC004FF, | 233 | .end = 0xFFC004FF, |
234 | .flags = IORESOURCE_MEM, | 234 | .flags = IORESOURCE_MEM, |
235 | }, | 235 | }, |
236 | { | ||
237 | .start = IRQ_UART0_RX, | ||
238 | .end = IRQ_UART0_RX+1, | ||
239 | .flags = IORESOURCE_IRQ, | ||
240 | }, | ||
241 | { | ||
242 | .start = CH_UART0_RX, | ||
243 | .end = CH_UART0_RX+1, | ||
244 | .flags = IORESOURCE_DMA, | ||
245 | }, | ||
246 | }; | ||
247 | |||
248 | static struct platform_device bfin_sir0_device = { | ||
249 | .name = "bfin_sir", | ||
250 | .id = 0, | ||
251 | .num_resources = ARRAY_SIZE(bfin_sir0_resources), | ||
252 | .resource = bfin_sir0_resources, | ||
253 | }; | ||
236 | #endif | 254 | #endif |
237 | #ifdef CONFIG_BFIN_SIR1 | 255 | #ifdef CONFIG_BFIN_SIR1 |
256 | static struct resource bfin_sir1_resources[] = { | ||
238 | { | 257 | { |
239 | .start = 0xFFC02000, | 258 | .start = 0xFFC02000, |
240 | .end = 0xFFC020FF, | 259 | .end = 0xFFC020FF, |
241 | .flags = IORESOURCE_MEM, | 260 | .flags = IORESOURCE_MEM, |
242 | }, | 261 | }, |
243 | #endif | 262 | { |
263 | .start = IRQ_UART1_RX, | ||
264 | .end = IRQ_UART1_RX+1, | ||
265 | .flags = IORESOURCE_IRQ, | ||
266 | }, | ||
267 | { | ||
268 | .start = CH_UART1_RX, | ||
269 | .end = CH_UART1_RX+1, | ||
270 | .flags = IORESOURCE_DMA, | ||
271 | }, | ||
244 | }; | 272 | }; |
245 | 273 | ||
246 | static struct platform_device bfin_sir_device = { | 274 | static struct platform_device bfin_sir1_device = { |
247 | .name = "bfin_sir", | 275 | .name = "bfin_sir", |
248 | .id = 0, | 276 | .id = 1, |
249 | .num_resources = ARRAY_SIZE(bfin_sir_resources), | 277 | .num_resources = ARRAY_SIZE(bfin_sir1_resources), |
250 | .resource = bfin_sir_resources, | 278 | .resource = bfin_sir1_resources, |
251 | }; | 279 | }; |
252 | #endif | 280 | #endif |
281 | #endif | ||
253 | 282 | ||
254 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) | 283 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) |
255 | static struct resource bfin_twi0_resource[] = { | 284 | static struct resource bfin_twi0_resource[] = { |
@@ -311,7 +340,12 @@ static struct platform_device *minotaur_devices[] __initdata = { | |||
311 | #endif | 340 | #endif |
312 | 341 | ||
313 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) | 342 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) |
314 | &bfin_sir_device, | 343 | #ifdef CONFIG_BFIN_SIR0 |
344 | &bfin_sir0_device, | ||
345 | #endif | ||
346 | #ifdef CONFIG_BFIN_SIR1 | ||
347 | &bfin_sir1_device, | ||
348 | #endif | ||
315 | #endif | 349 | #endif |
316 | 350 | ||
317 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) | 351 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) |