diff options
Diffstat (limited to 'arch/blackfin/mach-bf537/boards/generic_board.c')
-rw-r--r-- | arch/blackfin/mach-bf537/boards/generic_board.c | 48 |
1 files changed, 41 insertions, 7 deletions
diff --git a/arch/blackfin/mach-bf537/boards/generic_board.c b/arch/blackfin/mach-bf537/boards/generic_board.c index e9a497114347..dd6e6bfb98ea 100644 --- a/arch/blackfin/mach-bf537/boards/generic_board.c +++ b/arch/blackfin/mach-bf537/boards/generic_board.c | |||
@@ -548,30 +548,59 @@ static struct platform_device bfin_uart_device = { | |||
548 | #endif | 548 | #endif |
549 | 549 | ||
550 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) | 550 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) |
551 | static struct resource bfin_sir_resources[] = { | ||
552 | #ifdef CONFIG_BFIN_SIR0 | 551 | #ifdef CONFIG_BFIN_SIR0 |
552 | static struct resource bfin_sir0_resources[] = { | ||
553 | { | 553 | { |
554 | .start = 0xFFC00400, | 554 | .start = 0xFFC00400, |
555 | .end = 0xFFC004FF, | 555 | .end = 0xFFC004FF, |
556 | .flags = IORESOURCE_MEM, | 556 | .flags = IORESOURCE_MEM, |
557 | }, | 557 | }, |
558 | { | ||
559 | .start = IRQ_UART0_RX, | ||
560 | .end = IRQ_UART0_RX+1, | ||
561 | .flags = IORESOURCE_IRQ, | ||
562 | }, | ||
563 | { | ||
564 | .start = CH_UART0_RX, | ||
565 | .end = CH_UART0_RX+1, | ||
566 | .flags = IORESOURCE_DMA, | ||
567 | }, | ||
568 | }; | ||
569 | |||
570 | static struct platform_device bfin_sir0_device = { | ||
571 | .name = "bfin_sir", | ||
572 | .id = 0, | ||
573 | .num_resources = ARRAY_SIZE(bfin_sir0_resources), | ||
574 | .resource = bfin_sir0_resources, | ||
575 | }; | ||
558 | #endif | 576 | #endif |
559 | #ifdef CONFIG_BFIN_SIR1 | 577 | #ifdef CONFIG_BFIN_SIR1 |
578 | static struct resource bfin_sir1_resources[] = { | ||
560 | { | 579 | { |
561 | .start = 0xFFC02000, | 580 | .start = 0xFFC02000, |
562 | .end = 0xFFC020FF, | 581 | .end = 0xFFC020FF, |
563 | .flags = IORESOURCE_MEM, | 582 | .flags = IORESOURCE_MEM, |
564 | }, | 583 | }, |
565 | #endif | 584 | { |
585 | .start = IRQ_UART1_RX, | ||
586 | .end = IRQ_UART1_RX+1, | ||
587 | .flags = IORESOURCE_IRQ, | ||
588 | }, | ||
589 | { | ||
590 | .start = CH_UART1_RX, | ||
591 | .end = CH_UART1_RX+1, | ||
592 | .flags = IORESOURCE_DMA, | ||
593 | }, | ||
566 | }; | 594 | }; |
567 | 595 | ||
568 | static struct platform_device bfin_sir_device = { | 596 | static struct platform_device bfin_sir1_device = { |
569 | .name = "bfin_sir", | 597 | .name = "bfin_sir", |
570 | .id = 0, | 598 | .id = 1, |
571 | .num_resources = ARRAY_SIZE(bfin_sir_resources), | 599 | .num_resources = ARRAY_SIZE(bfin_sir1_resources), |
572 | .resource = bfin_sir_resources, | 600 | .resource = bfin_sir1_resources, |
573 | }; | 601 | }; |
574 | #endif | 602 | #endif |
603 | #endif | ||
575 | 604 | ||
576 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) | 605 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) |
577 | static struct resource bfin_twi0_resource[] = { | 606 | static struct resource bfin_twi0_resource[] = { |
@@ -661,7 +690,12 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
661 | #endif | 690 | #endif |
662 | 691 | ||
663 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) | 692 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) |
664 | &bfin_sir_device, | 693 | #ifdef CONFIG_BFIN_SIR0 |
694 | &bfin_sir0_device, | ||
695 | #endif | ||
696 | #ifdef CONFIG_BFIN_SIR1 | ||
697 | &bfin_sir1_device, | ||
698 | #endif | ||
665 | #endif | 699 | #endif |
666 | 700 | ||
667 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) | 701 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) |