Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: pxa: remove the DMA IO resources

As the last driver using the former mechanism to acquire the DMA
requestor line has be converted to the dma_slave_map, remove all these
resources from the PXA devices.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>

-136
-136
arch/arm/mach-pxa/devices.c
··· 60 60 .end = IRQ_MMC, 61 61 .flags = IORESOURCE_IRQ, 62 62 }, 63 - [2] = { 64 - .start = 21, 65 - .end = 21, 66 - .flags = IORESOURCE_DMA, 67 - }, 68 - [3] = { 69 - .start = 22, 70 - .end = 22, 71 - .flags = IORESOURCE_DMA, 72 - }, 73 63 }; 74 64 75 65 static u64 pxamci_dmamask = 0xffffffffUL; ··· 397 407 .end = 0x40700023, 398 408 .flags = IORESOURCE_MEM, 399 409 }, 400 - [5] = { 401 - .start = 17, 402 - .end = 17, 403 - .flags = IORESOURCE_DMA, 404 - }, 405 - [6] = { 406 - .start = 18, 407 - .end = 18, 408 - .flags = IORESOURCE_DMA, 409 - }, 410 410 }; 411 411 412 412 struct platform_device pxa_device_ficp = { ··· 525 545 .end = IRQ_SSP, 526 546 .flags = IORESOURCE_IRQ, 527 547 }, 528 - [2] = { 529 - /* DRCMR for RX */ 530 - .start = 13, 531 - .end = 13, 532 - .flags = IORESOURCE_DMA, 533 - }, 534 - [3] = { 535 - /* DRCMR for TX */ 536 - .start = 14, 537 - .end = 14, 538 - .flags = IORESOURCE_DMA, 539 - }, 540 548 }; 541 549 542 550 struct platform_device pxa25x_device_ssp = { ··· 551 583 .end = IRQ_NSSP, 552 584 .flags = IORESOURCE_IRQ, 553 585 }, 554 - [2] = { 555 - /* DRCMR for RX */ 556 - .start = 15, 557 - .end = 15, 558 - .flags = IORESOURCE_DMA, 559 - }, 560 - [3] = { 561 - /* DRCMR for TX */ 562 - .start = 16, 563 - .end = 16, 564 - .flags = IORESOURCE_DMA, 565 - }, 566 586 }; 567 587 568 588 struct platform_device pxa25x_device_nssp = { ··· 576 620 .start = IRQ_ASSP, 577 621 .end = IRQ_ASSP, 578 622 .flags = IORESOURCE_IRQ, 579 - }, 580 - [2] = { 581 - /* DRCMR for RX */ 582 - .start = 23, 583 - .end = 23, 584 - .flags = IORESOURCE_DMA, 585 - }, 586 - [3] = { 587 - /* DRCMR for TX */ 588 - .start = 24, 589 - .end = 24, 590 - .flags = IORESOURCE_DMA, 591 623 }, 592 624 }; 593 625 ··· 695 751 .end = IRQ_SSP, 696 752 .flags = IORESOURCE_IRQ, 697 753 }, 698 - [2] = { 699 - /* DRCMR for RX */ 700 - .start = 13, 701 - .end = 13, 702 - .flags = IORESOURCE_DMA, 703 - }, 704 - [3] = { 705 - /* DRCMR for TX */ 706 - .start = 14, 707 - .end = 14, 708 - .flags = IORESOURCE_DMA, 709 - }, 710 754 }; 711 755 712 756 struct platform_device pxa27x_device_ssp1 = { ··· 721 789 .end = IRQ_SSP2, 722 790 .flags = IORESOURCE_IRQ, 723 791 }, 724 - [2] = { 725 - /* DRCMR for RX */ 726 - .start = 15, 727 - .end = 15, 728 - .flags = IORESOURCE_DMA, 729 - }, 730 - [3] = { 731 - /* DRCMR for TX */ 732 - .start = 16, 733 - .end = 16, 734 - .flags = IORESOURCE_DMA, 735 - }, 736 792 }; 737 793 738 794 struct platform_device pxa27x_device_ssp2 = { ··· 746 826 .start = IRQ_SSP3, 747 827 .end = IRQ_SSP3, 748 828 .flags = IORESOURCE_IRQ, 749 - }, 750 - [2] = { 751 - /* DRCMR for RX */ 752 - .start = 66, 753 - .end = 66, 754 - .flags = IORESOURCE_DMA, 755 - }, 756 - [3] = { 757 - /* DRCMR for TX */ 758 - .start = 67, 759 - .end = 67, 760 - .flags = IORESOURCE_DMA, 761 829 }, 762 830 }; 763 831 ··· 803 895 .end = IRQ_MMC2, 804 896 .flags = IORESOURCE_IRQ, 805 897 }, 806 - [2] = { 807 - .start = 93, 808 - .end = 93, 809 - .flags = IORESOURCE_DMA, 810 - }, 811 - [3] = { 812 - .start = 94, 813 - .end = 94, 814 - .flags = IORESOURCE_DMA, 815 - }, 816 898 }; 817 899 818 900 struct platform_device pxa3xx_device_mci2 = { ··· 831 933 .start = IRQ_MMC3, 832 934 .end = IRQ_MMC3, 833 935 .flags = IORESOURCE_IRQ, 834 - }, 835 - [2] = { 836 - .start = 100, 837 - .end = 100, 838 - .flags = IORESOURCE_DMA, 839 - }, 840 - [3] = { 841 - .start = 101, 842 - .end = 101, 843 - .flags = IORESOURCE_DMA, 844 936 }, 845 937 }; 846 938 ··· 909 1021 .end = IRQ_NAND, 910 1022 .flags = IORESOURCE_IRQ, 911 1023 }, 912 - [2] = { 913 - /* DRCMR for Data DMA */ 914 - .start = 97, 915 - .end = 97, 916 - .flags = IORESOURCE_DMA, 917 - }, 918 - [3] = { 919 - /* DRCMR for Command DMA */ 920 - .start = 99, 921 - .end = 99, 922 - .flags = IORESOURCE_DMA, 923 - }, 924 1024 }; 925 1025 926 1026 static u64 pxa3xx_nand_dma_mask = DMA_BIT_MASK(32); ··· 941 1065 .start = IRQ_SSP4, 942 1066 .end = IRQ_SSP4, 943 1067 .flags = IORESOURCE_IRQ, 944 - }, 945 - [2] = { 946 - /* DRCMR for RX */ 947 - .start = 2, 948 - .end = 2, 949 - .flags = IORESOURCE_DMA, 950 - }, 951 - [3] = { 952 - /* DRCMR for TX */ 953 - .start = 3, 954 - .end = 3, 955 - .flags = IORESOURCE_DMA, 956 1068 }, 957 1069 }; 958 1070