aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin/mach-bf527
diff options
context:
space:
mode:
authorGraf Yang <graf.yang@analog.com>2009-01-07 10:14:39 -0500
committerBryan Wu <cooloney@kernel.org>2009-01-07 10:14:39 -0500
commit42bd8bcb2fa1853fda9c51d956f70bbe2329bdfb (patch)
treeda6e1022ee8e19380444d026dc40e6e989489a85 /arch/blackfin/mach-bf527
parentc0948d3316eaf3fdacc461c2c9e18441022e9e63 (diff)
Blackfin arch: Modify bfin_sir device configuration to board file
Signed-off-by: Graf Yang <graf.yang@analog.com> Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch/blackfin/mach-bf527')
-rw-r--r--arch/blackfin/mach-bf527/boards/cm_bf527.c48
-rw-r--r--arch/blackfin/mach-bf527/boards/ezbrd.c48
-rw-r--r--arch/blackfin/mach-bf527/boards/ezkit.c48
3 files changed, 123 insertions, 21 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)
720static struct resource bfin_sir_resources[] = {
721#ifdef CONFIG_BFIN_SIR0 720#ifdef CONFIG_BFIN_SIR0
721static 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
739static 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
747static 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
737static struct platform_device bfin_sir_device = { 765static 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)
746static struct resource bfin_twi0_resource[] = { 775static 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)
diff --git a/arch/blackfin/mach-bf527/boards/ezbrd.c b/arch/blackfin/mach-bf527/boards/ezbrd.c
index dab58a702c8e..4e67f587a141 100644
--- a/arch/blackfin/mach-bf527/boards/ezbrd.c
+++ b/arch/blackfin/mach-bf527/boards/ezbrd.c
@@ -478,30 +478,59 @@ static struct platform_device bfin_uart_device = {
478#endif 478#endif
479 479
480#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) 480#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
481static struct resource bfin_sir_resources[] = {
482#ifdef CONFIG_BFIN_SIR0 481#ifdef CONFIG_BFIN_SIR0
482static struct resource bfin_sir0_resources[] = {
483 { 483 {
484 .start = 0xFFC00400, 484 .start = 0xFFC00400,
485 .end = 0xFFC004FF, 485 .end = 0xFFC004FF,
486 .flags = IORESOURCE_MEM, 486 .flags = IORESOURCE_MEM,
487 }, 487 },
488 {
489 .start = IRQ_UART0_RX,
490 .end = IRQ_UART0_RX+1,
491 .flags = IORESOURCE_IRQ,
492 },
493 {
494 .start = CH_UART0_RX,
495 .end = CH_UART0_RX+1,
496 .flags = IORESOURCE_DMA,
497 },
498};
499
500static struct platform_device bfin_sir0_device = {
501 .name = "bfin_sir",
502 .id = 0,
503 .num_resources = ARRAY_SIZE(bfin_sir0_resources),
504 .resource = bfin_sir0_resources,
505};
488#endif 506#endif
489#ifdef CONFIG_BFIN_SIR1 507#ifdef CONFIG_BFIN_SIR1
508static struct resource bfin_sir1_resources[] = {
490 { 509 {
491 .start = 0xFFC02000, 510 .start = 0xFFC02000,
492 .end = 0xFFC020FF, 511 .end = 0xFFC020FF,
493 .flags = IORESOURCE_MEM, 512 .flags = IORESOURCE_MEM,
494 }, 513 },
495#endif 514 {
515 .start = IRQ_UART1_RX,
516 .end = IRQ_UART1_RX+1,
517 .flags = IORESOURCE_IRQ,
518 },
519 {
520 .start = CH_UART1_RX,
521 .end = CH_UART1_RX+1,
522 .flags = IORESOURCE_DMA,
523 },
496}; 524};
497 525
498static struct platform_device bfin_sir_device = { 526static struct platform_device bfin_sir1_device = {
499 .name = "bfin_sir", 527 .name = "bfin_sir",
500 .id = 0, 528 .id = 1,
501 .num_resources = ARRAY_SIZE(bfin_sir_resources), 529 .num_resources = ARRAY_SIZE(bfin_sir1_resources),
502 .resource = bfin_sir_resources, 530 .resource = bfin_sir1_resources,
503}; 531};
504#endif 532#endif
533#endif
505 534
506#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) 535#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
507static struct resource bfin_twi0_resource[] = { 536static struct resource bfin_twi0_resource[] = {
@@ -671,7 +700,12 @@ static struct platform_device *stamp_devices[] __initdata = {
671#endif 700#endif
672 701
673#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) 702#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
674 &bfin_sir_device, 703#ifdef CONFIG_BFIN_SIR0
704 &bfin_sir0_device,
705#endif
706#ifdef CONFIG_BFIN_SIR1
707 &bfin_sir1_device,
708#endif
675#endif 709#endif
676 710
677#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) 711#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c
index dc0384d2b218..beea15041c2e 100644
--- a/arch/blackfin/mach-bf527/boards/ezkit.c
+++ b/arch/blackfin/mach-bf527/boards/ezkit.c
@@ -718,30 +718,59 @@ static struct platform_device bfin_uart_device = {
718#endif 718#endif
719 719
720#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) 720#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
721static struct resource bfin_sir_resources[] = {
722#ifdef CONFIG_BFIN_SIR0 721#ifdef CONFIG_BFIN_SIR0
722static struct resource bfin_sir0_resources[] = {
723 { 723 {
724 .start = 0xFFC00400, 724 .start = 0xFFC00400,
725 .end = 0xFFC004FF, 725 .end = 0xFFC004FF,
726 .flags = IORESOURCE_MEM, 726 .flags = IORESOURCE_MEM,
727 }, 727 },
728 {
729 .start = IRQ_UART0_RX,
730 .end = IRQ_UART0_RX+1,
731 .flags = IORESOURCE_IRQ,
732 },
733 {
734 .start = CH_UART0_RX,
735 .end = CH_UART0_RX+1,
736 .flags = IORESOURCE_DMA,
737 },
738};
739
740static struct platform_device bfin_sir0_device = {
741 .name = "bfin_sir",
742 .id = 0,
743 .num_resources = ARRAY_SIZE(bfin_sir0_resources),
744 .resource = bfin_sir0_resources,
745};
728#endif 746#endif
729#ifdef CONFIG_BFIN_SIR1 747#ifdef CONFIG_BFIN_SIR1
748static struct resource bfin_sir1_resources[] = {
730 { 749 {
731 .start = 0xFFC02000, 750 .start = 0xFFC02000,
732 .end = 0xFFC020FF, 751 .end = 0xFFC020FF,
733 .flags = IORESOURCE_MEM, 752 .flags = IORESOURCE_MEM,
734 }, 753 },
735#endif 754 {
755 .start = IRQ_UART1_RX,
756 .end = IRQ_UART1_RX+1,
757 .flags = IORESOURCE_IRQ,
758 },
759 {
760 .start = CH_UART1_RX,
761 .end = CH_UART1_RX+1,
762 .flags = IORESOURCE_DMA,
763 },
736}; 764};
737 765
738static struct platform_device bfin_sir_device = { 766static struct platform_device bfin_sir1_device = {
739 .name = "bfin_sir", 767 .name = "bfin_sir",
740 .id = 0, 768 .id = 1,
741 .num_resources = ARRAY_SIZE(bfin_sir_resources), 769 .num_resources = ARRAY_SIZE(bfin_sir1_resources),
742 .resource = bfin_sir_resources, 770 .resource = bfin_sir1_resources,
743}; 771};
744#endif 772#endif
773#endif
745 774
746#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) 775#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
747static struct resource bfin_twi0_resource[] = { 776static struct resource bfin_twi0_resource[] = {
@@ -951,7 +980,12 @@ static struct platform_device *stamp_devices[] __initdata = {
951#endif 980#endif
952 981
953#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) 982#if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
954 &bfin_sir_device, 983#ifdef CONFIG_BFIN_SIR0
984 &bfin_sir0_device,
985#endif
986#ifdef CONFIG_BFIN_SIR1
987 &bfin_sir1_device,
988#endif
955#endif 989#endif
956 990
957#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) 991#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)