From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v2,12/13] ARM: pxa: remove the DMA IO resources From: Robert Jarzmik Message-Id: <20180524070703.11901-13-robert.jarzmik@free.fr> Date: Thu, 24 May 2018 09:07:02 +0200 To: Daniel Mack , Haojian Zhuang , Robert Jarzmik , Ezequiel Garcia , Boris Brezillon , David Woodhouse , Brian Norris , Marek Vasut , Richard Weinberger , Liam Girdwood , Mark Brown , Arnd Bergmann Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org, dmaengine@vger.kernel.org, linux-media@vger.kernel.org, linux-mmc@vger.kernel.org, linux-mtd@lists.infradead.org, netdev@vger.kernel.org, alsa-devel@alsa-project.org List-ID: QXMgdGhlIGxhc3QgZHJpdmVyIHVzaW5nIHRoZSBmb3JtZXIgbWVjaGFuaXNtIHRvIGFjcXVpcmUg dGhlIERNQQpyZXF1ZXN0b3IgbGluZSBoYXMgYmUgY29udmVydGVkIHRvIHRoZSBkbWFfc2xhdmVf bWFwLCByZW1vdmUgYWxsIHRoZXNlCnJlc291cmNlcyBmcm9tIHRoZSBQWEEgZGV2aWNlcy4KClNp Z25lZC1vZmYtYnk6IFJvYmVydCBKYXJ6bWlrIDxyb2JlcnQuamFyem1pa0BmcmVlLmZyPgotLS0K IGFyY2gvYXJtL21hY2gtcHhhL2RldmljZXMuYyB8IDEzNiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEzNiBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9hcmNoL2FybS9tYWNoLXB4YS9kZXZpY2VzLmMgYi9hcmNoL2FybS9tYWNo LXB4YS9kZXZpY2VzLmMKaW5kZXggMWU4OTE1ZmMzNDBkLi41YTE2ZWE3NGUyOGEgMTAwNjQ0Ci0t LSBhL2FyY2gvYXJtL21hY2gtcHhhL2RldmljZXMuYworKysgYi9hcmNoL2FybS9tYWNoLXB4YS9k ZXZpY2VzLmMKQEAgLTYwLDE2ICs2MCw2IEBAIHN0YXRpYyBzdHJ1Y3QgcmVzb3VyY2UgcHhhbWNp X3Jlc291cmNlc1tdID0gewogCQkuZW5kCT0gSVJRX01NQywKIAkJLmZsYWdzCT0gSU9SRVNPVVJD RV9JUlEsCiAJfSwKLQlbMl0gPSB7Ci0JCS5zdGFydAk9IDIxLAotCQkuZW5kCT0gMjEsCi0JCS5m bGFncwk9IElPUkVTT1VSQ0VfRE1BLAotCX0sCi0JWzNdID0gewotCQkuc3RhcnQJPSAyMiwKLQkJ LmVuZAk9IDIyLAotCQkuZmxhZ3MJPSBJT1JFU09VUkNFX0RNQSwKLQl9LAogfTsKIAogc3RhdGlj IHU2NCBweGFtY2lfZG1hbWFzayA9IDB4ZmZmZmZmZmZVTDsKQEAgLTQwNywxNiArMzk3LDYgQEAg c3RhdGljIHN0cnVjdCByZXNvdXJjZSBweGFfaXJfcmVzb3VyY2VzW10gPSB7CiAJCS5lbmQJPSAw eDQwNzAwMDIzLAogCQkuZmxhZ3MgID0gSU9SRVNPVVJDRV9NRU0sCiAJfSwKLQlbNV0gPSB7Ci0J CS5zdGFydCAgPSAxNywKLQkJLmVuZAk9IDE3LAotCQkuZmxhZ3MgID0gSU9SRVNPVVJDRV9ETUEs Ci0JfSwKLQlbNl0gPSB7Ci0JCS5zdGFydCAgPSAxOCwKLQkJLmVuZAk9IDE4LAotCQkuZmxhZ3Mg ID0gSU9SRVNPVVJDRV9ETUEsCi0JfSwKIH07CiAKIHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgcHhh X2RldmljZV9maWNwID0gewpAQCAtNTQ1LDE4ICs1MjUsNiBAQCBzdGF0aWMgc3RydWN0IHJlc291 cmNlIHB4YTI1eF9yZXNvdXJjZV9zc3BbXSA9IHsKIAkJLmVuZAk9IElSUV9TU1AsCiAJCS5mbGFn cwk9IElPUkVTT1VSQ0VfSVJRLAogCX0sCi0JWzJdID0gewotCQkvKiBEUkNNUiBmb3IgUlggKi8K LQkJLnN0YXJ0CT0gMTMsCi0JCS5lbmQJPSAxMywKLQkJLmZsYWdzCT0gSU9SRVNPVVJDRV9ETUEs Ci0JfSwKLQlbM10gPSB7Ci0JCS8qIERSQ01SIGZvciBUWCAqLwotCQkuc3RhcnQJPSAxNCwKLQkJ LmVuZAk9IDE0LAotCQkuZmxhZ3MJPSBJT1JFU09VUkNFX0RNQSwKLQl9LAogfTsKIAogc3RydWN0 IHBsYXRmb3JtX2RldmljZSBweGEyNXhfZGV2aWNlX3NzcCA9IHsKQEAgLTU4MywxOCArNTUxLDYg QEAgc3RhdGljIHN0cnVjdCByZXNvdXJjZSBweGEyNXhfcmVzb3VyY2VfbnNzcFtdID0gewogCQku ZW5kCT0gSVJRX05TU1AsCiAJCS5mbGFncwk9IElPUkVTT1VSQ0VfSVJRLAogCX0sCi0JWzJdID0g ewotCQkvKiBEUkNNUiBmb3IgUlggKi8KLQkJLnN0YXJ0CT0gMTUsCi0JCS5lbmQJPSAxNSwKLQkJ LmZsYWdzCT0gSU9SRVNPVVJDRV9ETUEsCi0JfSwKLQlbM10gPSB7Ci0JCS8qIERSQ01SIGZvciBU WCAqLwotCQkuc3RhcnQJPSAxNiwKLQkJLmVuZAk9IDE2LAotCQkuZmxhZ3MJPSBJT1JFU09VUkNF X0RNQSwKLQl9LAogfTsKIAogc3RydWN0IHBsYXRmb3JtX2RldmljZSBweGEyNXhfZGV2aWNlX25z c3AgPSB7CkBAIC02MjEsMTggKzU3Nyw2IEBAIHN0YXRpYyBzdHJ1Y3QgcmVzb3VyY2UgcHhhMjV4 X3Jlc291cmNlX2Fzc3BbXSA9IHsKIAkJLmVuZAk9IElSUV9BU1NQLAogCQkuZmxhZ3MJPSBJT1JF U09VUkNFX0lSUSwKIAl9LAotCVsyXSA9IHsKLQkJLyogRFJDTVIgZm9yIFJYICovCi0JCS5zdGFy dAk9IDIzLAotCQkuZW5kCT0gMjMsCi0JCS5mbGFncwk9IElPUkVTT1VSQ0VfRE1BLAotCX0sCi0J WzNdID0gewotCQkvKiBEUkNNUiBmb3IgVFggKi8KLQkJLnN0YXJ0CT0gMjQsCi0JCS5lbmQJPSAy NCwKLQkJLmZsYWdzCT0gSU9SRVNPVVJDRV9ETUEsCi0JfSwKIH07CiAKIHN0cnVjdCBwbGF0Zm9y bV9kZXZpY2UgcHhhMjV4X2RldmljZV9hc3NwID0gewpAQCAtNzUxLDE4ICs2OTUsNiBAQCBzdGF0 aWMgc3RydWN0IHJlc291cmNlIHB4YTI3eF9yZXNvdXJjZV9zc3AxW10gPSB7CiAJCS5lbmQJPSBJ UlFfU1NQLAogCQkuZmxhZ3MJPSBJT1JFU09VUkNFX0lSUSwKIAl9LAotCVsyXSA9IHsKLQkJLyog RFJDTVIgZm9yIFJYICovCi0JCS5zdGFydAk9IDEzLAotCQkuZW5kCT0gMTMsCi0JCS5mbGFncwk9 IElPUkVTT1VSQ0VfRE1BLAotCX0sCi0JWzNdID0gewotCQkvKiBEUkNNUiBmb3IgVFggKi8KLQkJ LnN0YXJ0CT0gMTQsCi0JCS5lbmQJPSAxNCwKLQkJLmZsYWdzCT0gSU9SRVNPVVJDRV9ETUEsCi0J fSwKIH07CiAKIHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgcHhhMjd4X2RldmljZV9zc3AxID0gewpA QCAtNzg5LDE4ICs3MjEsNiBAQCBzdGF0aWMgc3RydWN0IHJlc291cmNlIHB4YTI3eF9yZXNvdXJj ZV9zc3AyW10gPSB7CiAJCS5lbmQJPSBJUlFfU1NQMiwKIAkJLmZsYWdzCT0gSU9SRVNPVVJDRV9J UlEsCiAJfSwKLQlbMl0gPSB7Ci0JCS8qIERSQ01SIGZvciBSWCAqLwotCQkuc3RhcnQJPSAxNSwK LQkJLmVuZAk9IDE1LAotCQkuZmxhZ3MJPSBJT1JFU09VUkNFX0RNQSwKLQl9LAotCVszXSA9IHsK LQkJLyogRFJDTVIgZm9yIFRYICovCi0JCS5zdGFydAk9IDE2LAotCQkuZW5kCT0gMTYsCi0JCS5m bGFncwk9IElPUkVTT1VSQ0VfRE1BLAotCX0sCiB9OwogCiBzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNl IHB4YTI3eF9kZXZpY2Vfc3NwMiA9IHsKQEAgLTgyNywxOCArNzQ3LDYgQEAgc3RhdGljIHN0cnVj dCByZXNvdXJjZSBweGEyN3hfcmVzb3VyY2Vfc3NwM1tdID0gewogCQkuZW5kCT0gSVJRX1NTUDMs CiAJCS5mbGFncwk9IElPUkVTT1VSQ0VfSVJRLAogCX0sCi0JWzJdID0gewotCQkvKiBEUkNNUiBm b3IgUlggKi8KLQkJLnN0YXJ0CT0gNjYsCi0JCS5lbmQJPSA2NiwKLQkJLmZsYWdzCT0gSU9SRVNP VVJDRV9ETUEsCi0JfSwKLQlbM10gPSB7Ci0JCS8qIERSQ01SIGZvciBUWCAqLwotCQkuc3RhcnQJ PSA2NywKLQkJLmVuZAk9IDY3LAotCQkuZmxhZ3MJPSBJT1JFU09VUkNFX0RNQSwKLQl9LAogfTsK IAogc3RydWN0IHBsYXRmb3JtX2RldmljZSBweGEyN3hfZGV2aWNlX3NzcDMgPSB7CkBAIC04OTUs MTYgKzgwMyw2IEBAIHN0YXRpYyBzdHJ1Y3QgcmVzb3VyY2UgcHhhM3h4X3Jlc291cmNlc19tY2ky W10gPSB7CiAJCS5lbmQJPSBJUlFfTU1DMiwKIAkJLmZsYWdzCT0gSU9SRVNPVVJDRV9JUlEsCiAJ fSwKLQlbMl0gPSB7Ci0JCS5zdGFydAk9IDkzLAotCQkuZW5kCT0gOTMsCi0JCS5mbGFncwk9IElP UkVTT1VSQ0VfRE1BLAotCX0sCi0JWzNdID0gewotCQkuc3RhcnQJPSA5NCwKLQkJLmVuZAk9IDk0 LAotCQkuZmxhZ3MJPSBJT1JFU09VUkNFX0RNQSwKLQl9LAogfTsKIAogc3RydWN0IHBsYXRmb3Jt X2RldmljZSBweGEzeHhfZGV2aWNlX21jaTIgPSB7CkBAIC05MzQsMTYgKzgzMiw2IEBAIHN0YXRp YyBzdHJ1Y3QgcmVzb3VyY2UgcHhhM3h4X3Jlc291cmNlc19tY2kzW10gPSB7CiAJCS5lbmQJPSBJ UlFfTU1DMywKIAkJLmZsYWdzCT0gSU9SRVNPVVJDRV9JUlEsCiAJfSwKLQlbMl0gPSB7Ci0JCS5z dGFydAk9IDEwMCwKLQkJLmVuZAk9IDEwMCwKLQkJLmZsYWdzCT0gSU9SRVNPVVJDRV9ETUEsCi0J fSwKLQlbM10gPSB7Ci0JCS5zdGFydAk9IDEwMSwKLQkJLmVuZAk9IDEwMSwKLQkJLmZsYWdzCT0g SU9SRVNPVVJDRV9ETUEsCi0JfSwKIH07CiAKIHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgcHhhM3h4 X2RldmljZV9tY2kzID0gewpAQCAtMTAyMSwxOCArOTA5LDYgQEAgc3RhdGljIHN0cnVjdCByZXNv dXJjZSBweGEzeHhfcmVzb3VyY2VzX25hbmRbXSA9IHsKIAkJLmVuZAk9IElSUV9OQU5ELAogCQku ZmxhZ3MJPSBJT1JFU09VUkNFX0lSUSwKIAl9LAotCVsyXSA9IHsKLQkJLyogRFJDTVIgZm9yIERh dGEgRE1BICovCi0JCS5zdGFydAk9IDk3LAotCQkuZW5kCT0gOTcsCi0JCS5mbGFncwk9IElPUkVT T1VSQ0VfRE1BLAotCX0sCi0JWzNdID0gewotCQkvKiBEUkNNUiBmb3IgQ29tbWFuZCBETUEgKi8K LQkJLnN0YXJ0CT0gOTksCi0JCS5lbmQJPSA5OSwKLQkJLmZsYWdzCT0gSU9SRVNPVVJDRV9ETUEs Ci0JfSwKIH07CiAKIHN0YXRpYyB1NjQgcHhhM3h4X25hbmRfZG1hX21hc2sgPSBETUFfQklUX01B U0soMzIpOwpAQCAtMTA2NiwxOCArOTQyLDYgQEAgc3RhdGljIHN0cnVjdCByZXNvdXJjZSBweGEz eHhfcmVzb3VyY2Vfc3NwNFtdID0gewogCQkuZW5kCT0gSVJRX1NTUDQsCiAJCS5mbGFncwk9IElP UkVTT1VSQ0VfSVJRLAogCX0sCi0JWzJdID0gewotCQkvKiBEUkNNUiBmb3IgUlggKi8KLQkJLnN0 YXJ0CT0gMiwKLQkJLmVuZAk9IDIsCi0JCS5mbGFncwk9IElPUkVTT1VSQ0VfRE1BLAotCX0sCi0J WzNdID0gewotCQkvKiBEUkNNUiBmb3IgVFggKi8KLQkJLnN0YXJ0CT0gMywKLQkJLmVuZAk9IDMs Ci0JCS5mbGFncwk9IElPUkVTT1VSQ0VfRE1BLAotCX0sCiB9OwogCiAvKgo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robert Jarzmik Subject: [PATCH v2 12/13] ARM: pxa: remove the DMA IO resources Date: Thu, 24 May 2018 09:07:02 +0200 Message-ID: <20180524070703.11901-13-robert.jarzmik@free.fr> References: <20180524070703.11901-1-robert.jarzmik@free.fr> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20180524070703.11901-1-robert.jarzmik@free.fr> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Daniel Mack , Haojian Zhuang , Robert Jarzmik , Ezequiel Garcia , Boris Brezillon , David Woodhouse , Brian Norris , Marek Vasut , Richard Weinberger , Liam Girdwood , Mark Brown , Arnd Bergmann Cc: alsa-devel@alsa-project.org, netdev@vger.kernel.org, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org, linux-mtd@lists.infradead.org, dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org List-Id: linux-ide@vger.kernel.org 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 --- arch/arm/mach-pxa/devices.c | 136 -------------------------------------------- 1 file changed, 136 deletions(-) diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c index 1e8915fc340d..5a16ea74e28a 100644 --- a/arch/arm/mach-pxa/devices.c +++ b/arch/arm/mach-pxa/devices.c @@ -60,16 +60,6 @@ static struct resource pxamci_resources[] = { .end = IRQ_MMC, .flags = IORESOURCE_IRQ, }, - [2] = { - .start = 21, - .end = 21, - .flags = IORESOURCE_DMA, - }, - [3] = { - .start = 22, - .end = 22, - .flags = IORESOURCE_DMA, - }, }; static u64 pxamci_dmamask = 0xffffffffUL; @@ -407,16 +397,6 @@ static struct resource pxa_ir_resources[] = { .end = 0x40700023, .flags = IORESOURCE_MEM, }, - [5] = { - .start = 17, - .end = 17, - .flags = IORESOURCE_DMA, - }, - [6] = { - .start = 18, - .end = 18, - .flags = IORESOURCE_DMA, - }, }; struct platform_device pxa_device_ficp = { @@ -545,18 +525,6 @@ static struct resource pxa25x_resource_ssp[] = { .end = IRQ_SSP, .flags = IORESOURCE_IRQ, }, - [2] = { - /* DRCMR for RX */ - .start = 13, - .end = 13, - .flags = IORESOURCE_DMA, - }, - [3] = { - /* DRCMR for TX */ - .start = 14, - .end = 14, - .flags = IORESOURCE_DMA, - }, }; struct platform_device pxa25x_device_ssp = { @@ -583,18 +551,6 @@ static struct resource pxa25x_resource_nssp[] = { .end = IRQ_NSSP, .flags = IORESOURCE_IRQ, }, - [2] = { - /* DRCMR for RX */ - .start = 15, - .end = 15, - .flags = IORESOURCE_DMA, - }, - [3] = { - /* DRCMR for TX */ - .start = 16, - .end = 16, - .flags = IORESOURCE_DMA, - }, }; struct platform_device pxa25x_device_nssp = { @@ -621,18 +577,6 @@ static struct resource pxa25x_resource_assp[] = { .end = IRQ_ASSP, .flags = IORESOURCE_IRQ, }, - [2] = { - /* DRCMR for RX */ - .start = 23, - .end = 23, - .flags = IORESOURCE_DMA, - }, - [3] = { - /* DRCMR for TX */ - .start = 24, - .end = 24, - .flags = IORESOURCE_DMA, - }, }; struct platform_device pxa25x_device_assp = { @@ -751,18 +695,6 @@ static struct resource pxa27x_resource_ssp1[] = { .end = IRQ_SSP, .flags = IORESOURCE_IRQ, }, - [2] = { - /* DRCMR for RX */ - .start = 13, - .end = 13, - .flags = IORESOURCE_DMA, - }, - [3] = { - /* DRCMR for TX */ - .start = 14, - .end = 14, - .flags = IORESOURCE_DMA, - }, }; struct platform_device pxa27x_device_ssp1 = { @@ -789,18 +721,6 @@ static struct resource pxa27x_resource_ssp2[] = { .end = IRQ_SSP2, .flags = IORESOURCE_IRQ, }, - [2] = { - /* DRCMR for RX */ - .start = 15, - .end = 15, - .flags = IORESOURCE_DMA, - }, - [3] = { - /* DRCMR for TX */ - .start = 16, - .end = 16, - .flags = IORESOURCE_DMA, - }, }; struct platform_device pxa27x_device_ssp2 = { @@ -827,18 +747,6 @@ static struct resource pxa27x_resource_ssp3[] = { .end = IRQ_SSP3, .flags = IORESOURCE_IRQ, }, - [2] = { - /* DRCMR for RX */ - .start = 66, - .end = 66, - .flags = IORESOURCE_DMA, - }, - [3] = { - /* DRCMR for TX */ - .start = 67, - .end = 67, - .flags = IORESOURCE_DMA, - }, }; struct platform_device pxa27x_device_ssp3 = { @@ -895,16 +803,6 @@ static struct resource pxa3xx_resources_mci2[] = { .end = IRQ_MMC2, .flags = IORESOURCE_IRQ, }, - [2] = { - .start = 93, - .end = 93, - .flags = IORESOURCE_DMA, - }, - [3] = { - .start = 94, - .end = 94, - .flags = IORESOURCE_DMA, - }, }; struct platform_device pxa3xx_device_mci2 = { @@ -934,16 +832,6 @@ static struct resource pxa3xx_resources_mci3[] = { .end = IRQ_MMC3, .flags = IORESOURCE_IRQ, }, - [2] = { - .start = 100, - .end = 100, - .flags = IORESOURCE_DMA, - }, - [3] = { - .start = 101, - .end = 101, - .flags = IORESOURCE_DMA, - }, }; struct platform_device pxa3xx_device_mci3 = { @@ -1021,18 +909,6 @@ static struct resource pxa3xx_resources_nand[] = { .end = IRQ_NAND, .flags = IORESOURCE_IRQ, }, - [2] = { - /* DRCMR for Data DMA */ - .start = 97, - .end = 97, - .flags = IORESOURCE_DMA, - }, - [3] = { - /* DRCMR for Command DMA */ - .start = 99, - .end = 99, - .flags = IORESOURCE_DMA, - }, }; static u64 pxa3xx_nand_dma_mask = DMA_BIT_MASK(32); @@ -1066,18 +942,6 @@ static struct resource pxa3xx_resource_ssp4[] = { .end = IRQ_SSP4, .flags = IORESOURCE_IRQ, }, - [2] = { - /* DRCMR for RX */ - .start = 2, - .end = 2, - .flags = IORESOURCE_DMA, - }, - [3] = { - /* DRCMR for TX */ - .start = 3, - .end = 3, - .flags = IORESOURCE_DMA, - }, }; /* -- 2.11.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965069AbeEXHhv (ORCPT ); Thu, 24 May 2018 03:37:51 -0400 Received: from smtp01.smtpout.orange.fr ([80.12.242.123]:29483 "EHLO smtp.smtpout.orange.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964908AbeEXHhp (ORCPT ); Thu, 24 May 2018 03:37:45 -0400 X-ME-Helo: belgarion.home X-ME-Auth: amFyem1pay5yb2JlcnRAb3JhbmdlLmZy X-ME-Date: Thu, 24 May 2018 09:07:44 +0200 X-ME-IP: 90.55.202.35 From: Robert Jarzmik To: Daniel Mack , Haojian Zhuang , Robert Jarzmik , Ezequiel Garcia , Boris Brezillon , David Woodhouse , Brian Norris , Marek Vasut , Richard Weinberger , Liam Girdwood , Mark Brown , Arnd Bergmann Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org, dmaengine@vger.kernel.org, linux-media@vger.kernel.org, linux-mmc@vger.kernel.org, linux-mtd@lists.infradead.org, netdev@vger.kernel.org, alsa-devel@alsa-project.org Subject: [PATCH v2 12/13] ARM: pxa: remove the DMA IO resources Date: Thu, 24 May 2018 09:07:02 +0200 Message-Id: <20180524070703.11901-13-robert.jarzmik@free.fr> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180524070703.11901-1-robert.jarzmik@free.fr> References: <20180524070703.11901-1-robert.jarzmik@free.fr> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- arch/arm/mach-pxa/devices.c | 136 -------------------------------------------- 1 file changed, 136 deletions(-) diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c index 1e8915fc340d..5a16ea74e28a 100644 --- a/arch/arm/mach-pxa/devices.c +++ b/arch/arm/mach-pxa/devices.c @@ -60,16 +60,6 @@ static struct resource pxamci_resources[] = { .end = IRQ_MMC, .flags = IORESOURCE_IRQ, }, - [2] = { - .start = 21, - .end = 21, - .flags = IORESOURCE_DMA, - }, - [3] = { - .start = 22, - .end = 22, - .flags = IORESOURCE_DMA, - }, }; static u64 pxamci_dmamask = 0xffffffffUL; @@ -407,16 +397,6 @@ static struct resource pxa_ir_resources[] = { .end = 0x40700023, .flags = IORESOURCE_MEM, }, - [5] = { - .start = 17, - .end = 17, - .flags = IORESOURCE_DMA, - }, - [6] = { - .start = 18, - .end = 18, - .flags = IORESOURCE_DMA, - }, }; struct platform_device pxa_device_ficp = { @@ -545,18 +525,6 @@ static struct resource pxa25x_resource_ssp[] = { .end = IRQ_SSP, .flags = IORESOURCE_IRQ, }, - [2] = { - /* DRCMR for RX */ - .start = 13, - .end = 13, - .flags = IORESOURCE_DMA, - }, - [3] = { - /* DRCMR for TX */ - .start = 14, - .end = 14, - .flags = IORESOURCE_DMA, - }, }; struct platform_device pxa25x_device_ssp = { @@ -583,18 +551,6 @@ static struct resource pxa25x_resource_nssp[] = { .end = IRQ_NSSP, .flags = IORESOURCE_IRQ, }, - [2] = { - /* DRCMR for RX */ - .start = 15, - .end = 15, - .flags = IORESOURCE_DMA, - }, - [3] = { - /* DRCMR for TX */ - .start = 16, - .end = 16, - .flags = IORESOURCE_DMA, - }, }; struct platform_device pxa25x_device_nssp = { @@ -621,18 +577,6 @@ static struct resource pxa25x_resource_assp[] = { .end = IRQ_ASSP, .flags = IORESOURCE_IRQ, }, - [2] = { - /* DRCMR for RX */ - .start = 23, - .end = 23, - .flags = IORESOURCE_DMA, - }, - [3] = { - /* DRCMR for TX */ - .start = 24, - .end = 24, - .flags = IORESOURCE_DMA, - }, }; struct platform_device pxa25x_device_assp = { @@ -751,18 +695,6 @@ static struct resource pxa27x_resource_ssp1[] = { .end = IRQ_SSP, .flags = IORESOURCE_IRQ, }, - [2] = { - /* DRCMR for RX */ - .start = 13, - .end = 13, - .flags = IORESOURCE_DMA, - }, - [3] = { - /* DRCMR for TX */ - .start = 14, - .end = 14, - .flags = IORESOURCE_DMA, - }, }; struct platform_device pxa27x_device_ssp1 = { @@ -789,18 +721,6 @@ static struct resource pxa27x_resource_ssp2[] = { .end = IRQ_SSP2, .flags = IORESOURCE_IRQ, }, - [2] = { - /* DRCMR for RX */ - .start = 15, - .end = 15, - .flags = IORESOURCE_DMA, - }, - [3] = { - /* DRCMR for TX */ - .start = 16, - .end = 16, - .flags = IORESOURCE_DMA, - }, }; struct platform_device pxa27x_device_ssp2 = { @@ -827,18 +747,6 @@ static struct resource pxa27x_resource_ssp3[] = { .end = IRQ_SSP3, .flags = IORESOURCE_IRQ, }, - [2] = { - /* DRCMR for RX */ - .start = 66, - .end = 66, - .flags = IORESOURCE_DMA, - }, - [3] = { - /* DRCMR for TX */ - .start = 67, - .end = 67, - .flags = IORESOURCE_DMA, - }, }; struct platform_device pxa27x_device_ssp3 = { @@ -895,16 +803,6 @@ static struct resource pxa3xx_resources_mci2[] = { .end = IRQ_MMC2, .flags = IORESOURCE_IRQ, }, - [2] = { - .start = 93, - .end = 93, - .flags = IORESOURCE_DMA, - }, - [3] = { - .start = 94, - .end = 94, - .flags = IORESOURCE_DMA, - }, }; struct platform_device pxa3xx_device_mci2 = { @@ -934,16 +832,6 @@ static struct resource pxa3xx_resources_mci3[] = { .end = IRQ_MMC3, .flags = IORESOURCE_IRQ, }, - [2] = { - .start = 100, - .end = 100, - .flags = IORESOURCE_DMA, - }, - [3] = { - .start = 101, - .end = 101, - .flags = IORESOURCE_DMA, - }, }; struct platform_device pxa3xx_device_mci3 = { @@ -1021,18 +909,6 @@ static struct resource pxa3xx_resources_nand[] = { .end = IRQ_NAND, .flags = IORESOURCE_IRQ, }, - [2] = { - /* DRCMR for Data DMA */ - .start = 97, - .end = 97, - .flags = IORESOURCE_DMA, - }, - [3] = { - /* DRCMR for Command DMA */ - .start = 99, - .end = 99, - .flags = IORESOURCE_DMA, - }, }; static u64 pxa3xx_nand_dma_mask = DMA_BIT_MASK(32); @@ -1066,18 +942,6 @@ static struct resource pxa3xx_resource_ssp4[] = { .end = IRQ_SSP4, .flags = IORESOURCE_IRQ, }, - [2] = { - /* DRCMR for RX */ - .start = 2, - .end = 2, - .flags = IORESOURCE_DMA, - }, - [3] = { - /* DRCMR for TX */ - .start = 3, - .end = 3, - .flags = IORESOURCE_DMA, - }, }; /* -- 2.11.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: robert.jarzmik@free.fr (Robert Jarzmik) Date: Thu, 24 May 2018 09:07:02 +0200 Subject: [PATCH v2 12/13] ARM: pxa: remove the DMA IO resources In-Reply-To: <20180524070703.11901-1-robert.jarzmik@free.fr> References: <20180524070703.11901-1-robert.jarzmik@free.fr> Message-ID: <20180524070703.11901-13-robert.jarzmik@free.fr> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 --- arch/arm/mach-pxa/devices.c | 136 -------------------------------------------- 1 file changed, 136 deletions(-) diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c index 1e8915fc340d..5a16ea74e28a 100644 --- a/arch/arm/mach-pxa/devices.c +++ b/arch/arm/mach-pxa/devices.c @@ -60,16 +60,6 @@ static struct resource pxamci_resources[] = { .end = IRQ_MMC, .flags = IORESOURCE_IRQ, }, - [2] = { - .start = 21, - .end = 21, - .flags = IORESOURCE_DMA, - }, - [3] = { - .start = 22, - .end = 22, - .flags = IORESOURCE_DMA, - }, }; static u64 pxamci_dmamask = 0xffffffffUL; @@ -407,16 +397,6 @@ static struct resource pxa_ir_resources[] = { .end = 0x40700023, .flags = IORESOURCE_MEM, }, - [5] = { - .start = 17, - .end = 17, - .flags = IORESOURCE_DMA, - }, - [6] = { - .start = 18, - .end = 18, - .flags = IORESOURCE_DMA, - }, }; struct platform_device pxa_device_ficp = { @@ -545,18 +525,6 @@ static struct resource pxa25x_resource_ssp[] = { .end = IRQ_SSP, .flags = IORESOURCE_IRQ, }, - [2] = { - /* DRCMR for RX */ - .start = 13, - .end = 13, - .flags = IORESOURCE_DMA, - }, - [3] = { - /* DRCMR for TX */ - .start = 14, - .end = 14, - .flags = IORESOURCE_DMA, - }, }; struct platform_device pxa25x_device_ssp = { @@ -583,18 +551,6 @@ static struct resource pxa25x_resource_nssp[] = { .end = IRQ_NSSP, .flags = IORESOURCE_IRQ, }, - [2] = { - /* DRCMR for RX */ - .start = 15, - .end = 15, - .flags = IORESOURCE_DMA, - }, - [3] = { - /* DRCMR for TX */ - .start = 16, - .end = 16, - .flags = IORESOURCE_DMA, - }, }; struct platform_device pxa25x_device_nssp = { @@ -621,18 +577,6 @@ static struct resource pxa25x_resource_assp[] = { .end = IRQ_ASSP, .flags = IORESOURCE_IRQ, }, - [2] = { - /* DRCMR for RX */ - .start = 23, - .end = 23, - .flags = IORESOURCE_DMA, - }, - [3] = { - /* DRCMR for TX */ - .start = 24, - .end = 24, - .flags = IORESOURCE_DMA, - }, }; struct platform_device pxa25x_device_assp = { @@ -751,18 +695,6 @@ static struct resource pxa27x_resource_ssp1[] = { .end = IRQ_SSP, .flags = IORESOURCE_IRQ, }, - [2] = { - /* DRCMR for RX */ - .start = 13, - .end = 13, - .flags = IORESOURCE_DMA, - }, - [3] = { - /* DRCMR for TX */ - .start = 14, - .end = 14, - .flags = IORESOURCE_DMA, - }, }; struct platform_device pxa27x_device_ssp1 = { @@ -789,18 +721,6 @@ static struct resource pxa27x_resource_ssp2[] = { .end = IRQ_SSP2, .flags = IORESOURCE_IRQ, }, - [2] = { - /* DRCMR for RX */ - .start = 15, - .end = 15, - .flags = IORESOURCE_DMA, - }, - [3] = { - /* DRCMR for TX */ - .start = 16, - .end = 16, - .flags = IORESOURCE_DMA, - }, }; struct platform_device pxa27x_device_ssp2 = { @@ -827,18 +747,6 @@ static struct resource pxa27x_resource_ssp3[] = { .end = IRQ_SSP3, .flags = IORESOURCE_IRQ, }, - [2] = { - /* DRCMR for RX */ - .start = 66, - .end = 66, - .flags = IORESOURCE_DMA, - }, - [3] = { - /* DRCMR for TX */ - .start = 67, - .end = 67, - .flags = IORESOURCE_DMA, - }, }; struct platform_device pxa27x_device_ssp3 = { @@ -895,16 +803,6 @@ static struct resource pxa3xx_resources_mci2[] = { .end = IRQ_MMC2, .flags = IORESOURCE_IRQ, }, - [2] = { - .start = 93, - .end = 93, - .flags = IORESOURCE_DMA, - }, - [3] = { - .start = 94, - .end = 94, - .flags = IORESOURCE_DMA, - }, }; struct platform_device pxa3xx_device_mci2 = { @@ -934,16 +832,6 @@ static struct resource pxa3xx_resources_mci3[] = { .end = IRQ_MMC3, .flags = IORESOURCE_IRQ, }, - [2] = { - .start = 100, - .end = 100, - .flags = IORESOURCE_DMA, - }, - [3] = { - .start = 101, - .end = 101, - .flags = IORESOURCE_DMA, - }, }; struct platform_device pxa3xx_device_mci3 = { @@ -1021,18 +909,6 @@ static struct resource pxa3xx_resources_nand[] = { .end = IRQ_NAND, .flags = IORESOURCE_IRQ, }, - [2] = { - /* DRCMR for Data DMA */ - .start = 97, - .end = 97, - .flags = IORESOURCE_DMA, - }, - [3] = { - /* DRCMR for Command DMA */ - .start = 99, - .end = 99, - .flags = IORESOURCE_DMA, - }, }; static u64 pxa3xx_nand_dma_mask = DMA_BIT_MASK(32); @@ -1066,18 +942,6 @@ static struct resource pxa3xx_resource_ssp4[] = { .end = IRQ_SSP4, .flags = IORESOURCE_IRQ, }, - [2] = { - /* DRCMR for RX */ - .start = 2, - .end = 2, - .flags = IORESOURCE_DMA, - }, - [3] = { - /* DRCMR for TX */ - .start = 3, - .end = 3, - .flags = IORESOURCE_DMA, - }, }; /* -- 2.11.0