diff options
Diffstat (limited to 'arch/blackfin/mach-bf527/boards/cm_bf527.c')
-rw-r--r-- | arch/blackfin/mach-bf527/boards/cm_bf527.c | 48 |
1 files changed, 41 insertions, 7 deletions
diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c b/arch/blackfin/mach-bf527/boards/cm_bf527.c index 5797ac40fe2c..c17882b43686 100644 --- a/arch/blackfin/mach-bf527/boards/cm_bf527.c +++ b/arch/blackfin/mach-bf527/boards/cm_bf527.c | |||
@@ -717,30 +717,59 @@ static struct platform_device bfin_uart_device = { | |||
717 | #endif | 717 | #endif |
718 | 718 | ||
719 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) | 719 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) |
720 | static struct resource bfin_sir_resources[] = { | ||
721 | #ifdef CONFIG_BFIN_SIR0 | 720 | #ifdef CONFIG_BFIN_SIR0 |
721 | static struct resource bfin_sir0_resources[] = { | ||
722 | { | 722 | { |
723 | .start = 0xFFC00400, | 723 | .start = 0xFFC00400, |
724 | .end = 0xFFC004FF, | 724 | .end = 0xFFC004FF, |
725 | .flags = IORESOURCE_MEM, | 725 | .flags = IORESOURCE_MEM, |
726 | }, | 726 | }, |
727 | { | ||
728 | .start = IRQ_UART0_RX, | ||
729 | .end = IRQ_UART0_RX+1, | ||
730 | .flags = IORESOURCE_IRQ, | ||
731 | }, | ||
732 | { | ||
733 | .start = CH_UART0_RX, | ||
734 | .end = CH_UART0_RX+1, | ||
735 | .flags = IORESOURCE_DMA, | ||
736 | }, | ||
737 | }; | ||
738 | |||
739 | static struct platform_device bfin_sir0_device = { | ||
740 | .name = "bfin_sir", | ||
741 | .id = 0, | ||
742 | .num_resources = ARRAY_SIZE(bfin_sir0_resources), | ||
743 | .resource = bfin_sir0_resources, | ||
744 | }; | ||
727 | #endif | 745 | #endif |
728 | #ifdef CONFIG_BFIN_SIR1 | 746 | #ifdef CONFIG_BFIN_SIR1 |
747 | static struct resource bfin_sir1_resources[] = { | ||
729 | { | 748 | { |
730 | .start = 0xFFC02000, | 749 | .start = 0xFFC02000, |
731 | .end = 0xFFC020FF, | 750 | .end = 0xFFC020FF, |
732 | .flags = IORESOURCE_MEM, | 751 | .flags = IORESOURCE_MEM, |
733 | }, | 752 | }, |
734 | #endif | 753 | { |
754 | .start = IRQ_UART1_RX, | ||
755 | .end = IRQ_UART1_RX+1, | ||
756 | .flags = IORESOURCE_IRQ, | ||
757 | }, | ||
758 | { | ||
759 | .start = CH_UART1_RX, | ||
760 | .end = CH_UART1_RX+1, | ||
761 | .flags = IORESOURCE_DMA, | ||
762 | }, | ||
735 | }; | 763 | }; |
736 | 764 | ||
737 | static struct platform_device bfin_sir_device = { | 765 | static struct platform_device bfin_sir1_device = { |
738 | .name = "bfin_sir", | 766 | .name = "bfin_sir", |
739 | .id = 0, | 767 | .id = 1, |
740 | .num_resources = ARRAY_SIZE(bfin_sir_resources), | 768 | .num_resources = ARRAY_SIZE(bfin_sir1_resources), |
741 | .resource = bfin_sir_resources, | 769 | .resource = bfin_sir1_resources, |
742 | }; | 770 | }; |
743 | #endif | 771 | #endif |
772 | #endif | ||
744 | 773 | ||
745 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) | 774 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) |
746 | static struct resource bfin_twi0_resource[] = { | 775 | static struct resource bfin_twi0_resource[] = { |
@@ -911,7 +940,12 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
911 | #endif | 940 | #endif |
912 | 941 | ||
913 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) | 942 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) |
914 | &bfin_sir_device, | 943 | #ifdef CONFIG_BFIN_SIR0 |
944 | &bfin_sir0_device, | ||
945 | #endif | ||
946 | #ifdef CONFIG_BFIN_SIR1 | ||
947 | &bfin_sir1_device, | ||
948 | #endif | ||
915 | #endif | 949 | #endif |
916 | 950 | ||
917 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) | 951 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) |