diff options
Diffstat (limited to 'arch/blackfin/mach-bf537/boards/cm_bf537.c')
-rw-r--r-- | arch/blackfin/mach-bf537/boards/cm_bf537.c | 48 |
1 files changed, 40 insertions, 8 deletions
diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537.c b/arch/blackfin/mach-bf537/boards/cm_bf537.c index f13556b22ff0..6ac8e4d5bd38 100644 --- a/arch/blackfin/mach-bf537/boards/cm_bf537.c +++ b/arch/blackfin/mach-bf537/boards/cm_bf537.c | |||
@@ -392,30 +392,57 @@ static struct platform_device bfin_uart_device = { | |||
392 | #endif | 392 | #endif |
393 | 393 | ||
394 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) | 394 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) |
395 | static struct resource bfin_sir_resources[] = { | ||
396 | #ifdef CONFIG_BFIN_SIR0 | 395 | #ifdef CONFIG_BFIN_SIR0 |
396 | static struct resource bfin_sir0_resources[] = { | ||
397 | { | 397 | { |
398 | .start = 0xFFC00400, | 398 | .start = 0xFFC00400, |
399 | .end = 0xFFC004FF, | 399 | .end = 0xFFC004FF, |
400 | .flags = IORESOURCE_MEM, | 400 | .flags = IORESOURCE_MEM, |
401 | }, | 401 | }, |
402 | { | ||
403 | .start = IRQ_UART0_RX, | ||
404 | .end = IRQ_UART0_RX+1, | ||
405 | .flags = IORESOURCE_IRQ, | ||
406 | }, | ||
407 | { | ||
408 | .start = CH_UART0_RX, | ||
409 | .end = CH_UART0_RX+1, | ||
410 | .flags = IORESOURCE_DMA, | ||
411 | }, | ||
412 | }; | ||
413 | static struct platform_device bfin_sir0_device = { | ||
414 | .name = "bfin_sir", | ||
415 | .id = 0, | ||
416 | .num_resources = ARRAY_SIZE(bfin_sir0_resources), | ||
417 | .resource = bfin_sir0_resources, | ||
418 | }; | ||
402 | #endif | 419 | #endif |
403 | #ifdef CONFIG_BFIN_SIR1 | 420 | #ifdef CONFIG_BFIN_SIR1 |
421 | static struct resource bfin_sir1_resources[] = { | ||
404 | { | 422 | { |
405 | .start = 0xFFC02000, | 423 | .start = 0xFFC02000, |
406 | .end = 0xFFC020FF, | 424 | .end = 0xFFC020FF, |
407 | .flags = IORESOURCE_MEM, | 425 | .flags = IORESOURCE_MEM, |
408 | }, | 426 | }, |
409 | #endif | 427 | { |
428 | .start = IRQ_UART1_RX, | ||
429 | .end = IRQ_UART1_RX+1, | ||
430 | .flags = IORESOURCE_IRQ, | ||
431 | }, | ||
432 | { | ||
433 | .start = CH_UART1_RX, | ||
434 | .end = CH_UART1_RX+1, | ||
435 | .flags = IORESOURCE_DMA, | ||
436 | }, | ||
410 | }; | 437 | }; |
411 | 438 | static struct platform_device bfin_sir1_device = { | |
412 | static struct platform_device bfin_sir_device = { | ||
413 | .name = "bfin_sir", | 439 | .name = "bfin_sir", |
414 | .id = 0, | 440 | .id = 1, |
415 | .num_resources = ARRAY_SIZE(bfin_sir_resources), | 441 | .num_resources = ARRAY_SIZE(bfin_sir1_resources), |
416 | .resource = bfin_sir_resources, | 442 | .resource = bfin_sir1_resources, |
417 | }; | 443 | }; |
418 | #endif | 444 | #endif |
445 | #endif | ||
419 | 446 | ||
420 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) | 447 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) |
421 | static struct resource bfin_twi0_resource[] = { | 448 | static struct resource bfin_twi0_resource[] = { |
@@ -538,7 +565,12 @@ static struct platform_device *cm_bf537_devices[] __initdata = { | |||
538 | #endif | 565 | #endif |
539 | 566 | ||
540 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) | 567 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) |
541 | &bfin_sir_device, | 568 | #ifdef CONFIG_BFIN_SIR0 |
569 | &bfin_sir0_device, | ||
570 | #endif | ||
571 | #ifdef CONFIG_BFIN_SIR1 | ||
572 | &bfin_sir1_device, | ||
573 | #endif | ||
542 | #endif | 574 | #endif |
543 | 575 | ||
544 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) | 576 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) |