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

ARM: davinci: remove mmc dma resources

The davinci_mmc driver no longer uses platform resources for getting dma
channels. Instead lookup is now done using dma_slave_map.

Signed-off-by: David Lechner <david@lechnology.com>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

authored by

David Lechner and committed by
Ulf Hansson
d0071281 e2f3bfbd

-36
-20
arch/arm/mach-davinci/devices-da8xx.c
··· 751 751 .end = IRQ_DA8XX_MMCSDINT0, 752 752 .flags = IORESOURCE_IRQ, 753 753 }, 754 - { /* DMA RX */ 755 - .start = DA8XX_DMA_MMCSD0_RX, 756 - .end = DA8XX_DMA_MMCSD0_RX, 757 - .flags = IORESOURCE_DMA, 758 - }, 759 - { /* DMA TX */ 760 - .start = DA8XX_DMA_MMCSD0_TX, 761 - .end = DA8XX_DMA_MMCSD0_TX, 762 - .flags = IORESOURCE_DMA, 763 - }, 764 754 }; 765 755 766 756 static struct platform_device da8xx_mmcsd0_device = { ··· 777 787 .start = IRQ_DA850_MMCSDINT0_1, 778 788 .end = IRQ_DA850_MMCSDINT0_1, 779 789 .flags = IORESOURCE_IRQ, 780 - }, 781 - { /* DMA RX */ 782 - .start = DA850_DMA_MMCSD1_RX, 783 - .end = DA850_DMA_MMCSD1_RX, 784 - .flags = IORESOURCE_DMA, 785 - }, 786 - { /* DMA TX */ 787 - .start = DA850_DMA_MMCSD1_TX, 788 - .end = DA850_DMA_MMCSD1_TX, 789 - .flags = IORESOURCE_DMA, 790 790 }, 791 791 }; 792 792
-16
arch/arm/mach-davinci/devices.c
··· 144 144 .start = IRQ_SDIOINT, 145 145 .flags = IORESOURCE_IRQ, 146 146 }, 147 - /* DMA channels: RX, then TX */ 148 - { 149 - .start = EDMA_CTLR_CHAN(0, DAVINCI_DMA_MMCRXEVT), 150 - .flags = IORESOURCE_DMA, 151 - }, { 152 - .start = EDMA_CTLR_CHAN(0, DAVINCI_DMA_MMCTXEVT), 153 - .flags = IORESOURCE_DMA, 154 - }, 155 147 }; 156 148 157 149 static struct platform_device davinci_mmcsd0_device = { ··· 172 180 }, { 173 181 .start = IRQ_DM355_SDIOINT1, 174 182 .flags = IORESOURCE_IRQ, 175 - }, 176 - /* DMA channels: RX, then TX */ 177 - { 178 - .start = EDMA_CTLR_CHAN(0, 30), /* rx */ 179 - .flags = IORESOURCE_DMA, 180 - }, { 181 - .start = EDMA_CTLR_CHAN(0, 31), /* tx */ 182 - .flags = IORESOURCE_DMA, 183 183 }, 184 184 }; 185 185