diff options
author | Graf Yang <graf.yang@analog.com> | 2009-01-07 10:14:39 -0500 |
---|---|---|
committer | Bryan Wu <cooloney@kernel.org> | 2009-01-07 10:14:39 -0500 |
commit | 42bd8bcb2fa1853fda9c51d956f70bbe2329bdfb (patch) | |
tree | da6e1022ee8e19380444d026dc40e6e989489a85 /arch/blackfin/mach-bf537 | |
parent | c0948d3316eaf3fdacc461c2c9e18441022e9e63 (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-bf537')
-rw-r--r-- | arch/blackfin/mach-bf537/boards/cm_bf537.c | 48 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/generic_board.c | 48 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/minotaur.c | 48 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/pnav10.c | 48 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/stamp.c | 48 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/tcm_bf537.c | 48 |
6 files changed, 245 insertions, 43 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) |
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) |
diff --git a/arch/blackfin/mach-bf537/boards/minotaur.c b/arch/blackfin/mach-bf537/boards/minotaur.c index 48c4cd2d1be6..bb795341cb17 100644 --- a/arch/blackfin/mach-bf537/boards/minotaur.c +++ b/arch/blackfin/mach-bf537/boards/minotaur.c | |||
@@ -226,30 +226,59 @@ static struct platform_device bfin_uart_device = { | |||
226 | #endif | 226 | #endif |
227 | 227 | ||
228 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) | 228 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) |
229 | static struct resource bfin_sir_resources[] = { | ||
230 | #ifdef CONFIG_BFIN_SIR0 | 229 | #ifdef CONFIG_BFIN_SIR0 |
230 | static struct resource bfin_sir0_resources[] = { | ||
231 | { | 231 | { |
232 | .start = 0xFFC00400, | 232 | .start = 0xFFC00400, |
233 | .end = 0xFFC004FF, | 233 | .end = 0xFFC004FF, |
234 | .flags = IORESOURCE_MEM, | 234 | .flags = IORESOURCE_MEM, |
235 | }, | 235 | }, |
236 | { | ||
237 | .start = IRQ_UART0_RX, | ||
238 | .end = IRQ_UART0_RX+1, | ||
239 | .flags = IORESOURCE_IRQ, | ||
240 | }, | ||
241 | { | ||
242 | .start = CH_UART0_RX, | ||
243 | .end = CH_UART0_RX+1, | ||
244 | .flags = IORESOURCE_DMA, | ||
245 | }, | ||
246 | }; | ||
247 | |||
248 | static struct platform_device bfin_sir0_device = { | ||
249 | .name = "bfin_sir", | ||
250 | .id = 0, | ||
251 | .num_resources = ARRAY_SIZE(bfin_sir0_resources), | ||
252 | .resource = bfin_sir0_resources, | ||
253 | }; | ||
236 | #endif | 254 | #endif |
237 | #ifdef CONFIG_BFIN_SIR1 | 255 | #ifdef CONFIG_BFIN_SIR1 |
256 | static struct resource bfin_sir1_resources[] = { | ||
238 | { | 257 | { |
239 | .start = 0xFFC02000, | 258 | .start = 0xFFC02000, |
240 | .end = 0xFFC020FF, | 259 | .end = 0xFFC020FF, |
241 | .flags = IORESOURCE_MEM, | 260 | .flags = IORESOURCE_MEM, |
242 | }, | 261 | }, |
243 | #endif | 262 | { |
263 | .start = IRQ_UART1_RX, | ||
264 | .end = IRQ_UART1_RX+1, | ||
265 | .flags = IORESOURCE_IRQ, | ||
266 | }, | ||
267 | { | ||
268 | .start = CH_UART1_RX, | ||
269 | .end = CH_UART1_RX+1, | ||
270 | .flags = IORESOURCE_DMA, | ||
271 | }, | ||
244 | }; | 272 | }; |
245 | 273 | ||
246 | static struct platform_device bfin_sir_device = { | 274 | static struct platform_device bfin_sir1_device = { |
247 | .name = "bfin_sir", | 275 | .name = "bfin_sir", |
248 | .id = 0, | 276 | .id = 1, |
249 | .num_resources = ARRAY_SIZE(bfin_sir_resources), | 277 | .num_resources = ARRAY_SIZE(bfin_sir1_resources), |
250 | .resource = bfin_sir_resources, | 278 | .resource = bfin_sir1_resources, |
251 | }; | 279 | }; |
252 | #endif | 280 | #endif |
281 | #endif | ||
253 | 282 | ||
254 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) | 283 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) |
255 | static struct resource bfin_twi0_resource[] = { | 284 | static struct resource bfin_twi0_resource[] = { |
@@ -311,7 +340,12 @@ static struct platform_device *minotaur_devices[] __initdata = { | |||
311 | #endif | 340 | #endif |
312 | 341 | ||
313 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) | 342 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) |
314 | &bfin_sir_device, | 343 | #ifdef CONFIG_BFIN_SIR0 |
344 | &bfin_sir0_device, | ||
345 | #endif | ||
346 | #ifdef CONFIG_BFIN_SIR1 | ||
347 | &bfin_sir1_device, | ||
348 | #endif | ||
315 | #endif | 349 | #endif |
316 | 350 | ||
317 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) | 351 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) |
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 | ||
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c index 8facba669553..980121b7e084 100644 --- a/arch/blackfin/mach-bf537/boards/stamp.c +++ b/arch/blackfin/mach-bf537/boards/stamp.c | |||
@@ -905,30 +905,59 @@ static struct platform_device bfin_uart_device = { | |||
905 | #endif | 905 | #endif |
906 | 906 | ||
907 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) | 907 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) |
908 | static struct resource bfin_sir_resources[] = { | ||
909 | #ifdef CONFIG_BFIN_SIR0 | 908 | #ifdef CONFIG_BFIN_SIR0 |
909 | static struct resource bfin_sir0_resources[] = { | ||
910 | { | 910 | { |
911 | .start = 0xFFC00400, | 911 | .start = 0xFFC00400, |
912 | .end = 0xFFC004FF, | 912 | .end = 0xFFC004FF, |
913 | .flags = IORESOURCE_MEM, | 913 | .flags = IORESOURCE_MEM, |
914 | }, | 914 | }, |
915 | { | ||
916 | .start = IRQ_UART0_RX, | ||
917 | .end = IRQ_UART0_RX+1, | ||
918 | .flags = IORESOURCE_IRQ, | ||
919 | }, | ||
920 | { | ||
921 | .start = CH_UART0_RX, | ||
922 | .end = CH_UART0_RX+1, | ||
923 | .flags = IORESOURCE_DMA, | ||
924 | }, | ||
925 | }; | ||
926 | |||
927 | static struct platform_device bfin_sir0_device = { | ||
928 | .name = "bfin_sir", | ||
929 | .id = 0, | ||
930 | .num_resources = ARRAY_SIZE(bfin_sir0_resources), | ||
931 | .resource = bfin_sir0_resources, | ||
932 | }; | ||
915 | #endif | 933 | #endif |
916 | #ifdef CONFIG_BFIN_SIR1 | 934 | #ifdef CONFIG_BFIN_SIR1 |
935 | static struct resource bfin_sir1_resources[] = { | ||
917 | { | 936 | { |
918 | .start = 0xFFC02000, | 937 | .start = 0xFFC02000, |
919 | .end = 0xFFC020FF, | 938 | .end = 0xFFC020FF, |
920 | .flags = IORESOURCE_MEM, | 939 | .flags = IORESOURCE_MEM, |
921 | }, | 940 | }, |
922 | #endif | 941 | { |
942 | .start = IRQ_UART1_RX, | ||
943 | .end = IRQ_UART1_RX+1, | ||
944 | .flags = IORESOURCE_IRQ, | ||
945 | }, | ||
946 | { | ||
947 | .start = CH_UART1_RX, | ||
948 | .end = CH_UART1_RX+1, | ||
949 | .flags = IORESOURCE_DMA, | ||
950 | }, | ||
923 | }; | 951 | }; |
924 | 952 | ||
925 | static struct platform_device bfin_sir_device = { | 953 | static struct platform_device bfin_sir1_device = { |
926 | .name = "bfin_sir", | 954 | .name = "bfin_sir", |
927 | .id = 0, | 955 | .id = 1, |
928 | .num_resources = ARRAY_SIZE(bfin_sir_resources), | 956 | .num_resources = ARRAY_SIZE(bfin_sir1_resources), |
929 | .resource = bfin_sir_resources, | 957 | .resource = bfin_sir1_resources, |
930 | }; | 958 | }; |
931 | #endif | 959 | #endif |
960 | #endif | ||
932 | 961 | ||
933 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) | 962 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) |
934 | static struct resource bfin_twi0_resource[] = { | 963 | static struct resource bfin_twi0_resource[] = { |
@@ -1216,7 +1245,12 @@ static struct platform_device *stamp_devices[] __initdata = { | |||
1216 | #endif | 1245 | #endif |
1217 | 1246 | ||
1218 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) | 1247 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) |
1219 | &bfin_sir_device, | 1248 | #ifdef CONFIG_BFIN_SIR0 |
1249 | &bfin_sir0_device, | ||
1250 | #endif | ||
1251 | #ifdef CONFIG_BFIN_SIR1 | ||
1252 | &bfin_sir1_device, | ||
1253 | #endif | ||
1220 | #endif | 1254 | #endif |
1221 | 1255 | ||
1222 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) | 1256 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) |
diff --git a/arch/blackfin/mach-bf537/boards/tcm_bf537.c b/arch/blackfin/mach-bf537/boards/tcm_bf537.c index f122c3c7158e..2f4b066153c5 100644 --- a/arch/blackfin/mach-bf537/boards/tcm_bf537.c +++ b/arch/blackfin/mach-bf537/boards/tcm_bf537.c | |||
@@ -392,30 +392,59 @@ 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 | |||
414 | static struct platform_device bfin_sir0_device = { | ||
415 | .name = "bfin_sir", | ||
416 | .id = 0, | ||
417 | .num_resources = ARRAY_SIZE(bfin_sir0_resources), | ||
418 | .resource = bfin_sir0_resources, | ||
419 | }; | ||
402 | #endif | 420 | #endif |
403 | #ifdef CONFIG_BFIN_SIR1 | 421 | #ifdef CONFIG_BFIN_SIR1 |
422 | static struct resource bfin_sir1_resources[] = { | ||
404 | { | 423 | { |
405 | .start = 0xFFC02000, | 424 | .start = 0xFFC02000, |
406 | .end = 0xFFC020FF, | 425 | .end = 0xFFC020FF, |
407 | .flags = IORESOURCE_MEM, | 426 | .flags = IORESOURCE_MEM, |
408 | }, | 427 | }, |
409 | #endif | 428 | { |
429 | .start = IRQ_UART1_RX, | ||
430 | .end = IRQ_UART1_RX+1, | ||
431 | .flags = IORESOURCE_IRQ, | ||
432 | }, | ||
433 | { | ||
434 | .start = CH_UART1_RX, | ||
435 | .end = CH_UART1_RX+1, | ||
436 | .flags = IORESOURCE_DMA, | ||
437 | }, | ||
410 | }; | 438 | }; |
411 | 439 | ||
412 | static struct platform_device bfin_sir_device = { | 440 | static struct platform_device bfin_sir1_device = { |
413 | .name = "bfin_sir", | 441 | .name = "bfin_sir", |
414 | .id = 0, | 442 | .id = 1, |
415 | .num_resources = ARRAY_SIZE(bfin_sir_resources), | 443 | .num_resources = ARRAY_SIZE(bfin_sir1_resources), |
416 | .resource = bfin_sir_resources, | 444 | .resource = bfin_sir1_resources, |
417 | }; | 445 | }; |
418 | #endif | 446 | #endif |
447 | #endif | ||
419 | 448 | ||
420 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) | 449 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) |
421 | static struct resource bfin_twi0_resource[] = { | 450 | static struct resource bfin_twi0_resource[] = { |
@@ -538,7 +567,12 @@ static struct platform_device *cm_bf537_devices[] __initdata = { | |||
538 | #endif | 567 | #endif |
539 | 568 | ||
540 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) | 569 | #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE) |
541 | &bfin_sir_device, | 570 | #ifdef CONFIG_BFIN_SIR0 |
571 | &bfin_sir0_device, | ||
572 | #endif | ||
573 | #ifdef CONFIG_BFIN_SIR1 | ||
574 | &bfin_sir1_device, | ||
575 | #endif | ||
542 | #endif | 576 | #endif |
543 | 577 | ||
544 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) | 578 | #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE) |