diff options
Diffstat (limited to 'arch/blackfin/mach-bf537/boards/pnav10.c')
-rw-r--r-- | arch/blackfin/mach-bf537/boards/pnav10.c | 48 |
1 files changed, 41 insertions, 7 deletions
diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c b/arch/blackfin/mach-bf537/boards/pnav10.c index c7da15718e96..89de94f4545d 100644 --- a/arch/blackfin/mach-bf537/boards/pnav10.c +++ b/arch/blackfin/mach-bf537/boards/pnav10.c | |||
@@ -453,30 +453,59 @@ static struct platform_device bfin_uart_device = { | |||
453 | #endif | 453 | #endif |
454 | 454 | ||
455 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) | 455 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) |
456 | static struct resource bfin_sir_resources[] = { | ||
457 | #ifdef CONFIG_BFIN_SIR0 | 456 | #ifdef CONFIG_BFIN_SIR0 |
457 | static struct resource bfin_sir0_resources[] = { | ||
458 | { | 458 | { |
459 | .start = 0xFFC00400, | 459 | .start = 0xFFC00400, |
460 | .end = 0xFFC004FF, | 460 | .end = 0xFFC004FF, |
461 | .flags = IORESOURCE_MEM, | 461 | .flags = IORESOURCE_MEM, |
462 | }, | 462 | }, |
463 | { | ||
464 | .start = IRQ_UART0_RX, | ||
465 | .end = IRQ_UART0_RX+1, | ||
466 | .flags = IORESOURCE_IRQ, | ||
467 | }, | ||
468 | { | ||
469 | .start = CH_UART0_RX, | ||
470 | .end = CH_UART0_RX+1, | ||
471 | .flags = IORESOURCE_DMA, | ||
472 | }, | ||
473 | }; | ||
474 | |||
475 | static struct platform_device bfin_sir0_device = { | ||
476 | .name = "bfin_sir", | ||
477 | .id = 0, | ||
478 | .num_resources = ARRAY_SIZE(bfin_sir0_resources), | ||
479 | .resource = bfin_sir0_resources, | ||
480 | }; | ||
463 | #endif | 481 | #endif |
464 | #ifdef CONFIG_BFIN_SIR1 | 482 | #ifdef CONFIG_BFIN_SIR1 |
483 | static struct resource bfin_sir1_resources[] = { | ||
465 | { | 484 | { |
466 | .start = 0xFFC02000, | 485 | .start = 0xFFC02000, |
467 | .end = 0xFFC020FF, | 486 | .end = 0xFFC020FF, |
468 | .flags = IORESOURCE_MEM, | 487 | .flags = IORESOURCE_MEM, |
469 | }, | 488 | }, |
470 | #endif | 489 | { |
490 | .start = IRQ_UART1_RX, | ||
491 | .end = IRQ_UART1_RX+1, | ||
492 | .flags = IORESOURCE_IRQ, | ||
493 | }, | ||
494 | { | ||
495 | .start = CH_UART1_RX, | ||
496 | .end = CH_UART1_RX+1, | ||
497 | .flags = IORESOURCE_DMA, | ||
498 | }, | ||
471 | }; | 499 | }; |
472 | 500 | ||
473 | static struct platform_device bfin_sir_device = { | 501 | static struct platform_device bfin_sir1_device = { |
474 | .name = "bfin_sir", | 502 | .name = "bfin_sir", |
475 | .id = 0, | 503 | .id = 1, |
476 | .num_resources = ARRAY_SIZE(bfin_sir_resources), | 504 | .num_resources = ARRAY_SIZE(bfin_sir1_resources), |
477 | .resource = bfin_sir_resources, | 505 | .resource = bfin_sir1_resources, |
478 | }; | 506 | }; |
479 | #endif | 507 | #endif |
508 | #endif | ||
480 | 509 | ||
481 | static struct platform_device *stamp_devices[] __initdata = { | 510 | static struct platform_device *stamp_devices[] __initdata = { |
482 | #if defined(CONFIG_BFIN_CFPCMCIA) || defined(CONFIG_BFIN_CFPCMCIA_MODULE) | 511 | #if defined(CONFIG_BFIN_CFPCMCIA) || defined(CONFIG_BFIN_CFPCMCIA_MODULE) |
@@ -520,7 +549,12 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
520 | #endif | 549 | #endif |
521 | 550 | ||
522 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) | 551 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) |
523 | &bfin_sir_device, | 552 | #ifdef CONFIG_BFIN_SIR0 |
553 | &bfin_sir0_device, | ||
554 | #endif | ||
555 | #ifdef CONFIG_BFIN_SIR1 | ||
556 | &bfin_sir1_device, | ||
557 | #endif | ||
524 | #endif | 558 | #endif |
525 | }; | 559 | }; |
526 | 560 | ||