From: peter.ujfalusi@ti.com (Peter Ujfalusi)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 09/21] ARM: davinci: Add set dma_mask to eDMA devices
Date: Thu, 10 Sep 2015 11:37:38 +0300 [thread overview]
Message-ID: <1441874270-2399-10-git-send-email-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <1441874270-2399-1-git-send-email-peter.ujfalusi@ti.com>
The upcoming change to merge the arch/arm/common/edma.c into
drivers/dma/edma.c will need this change when booting daVinci devices in
no DT mode.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
arch/arm/mach-davinci/devices-da8xx.c | 8 ++++++++
arch/arm/mach-davinci/dm355.c | 8 +++++++-
arch/arm/mach-davinci/dm644x.c | 8 +++++++-
arch/arm/mach-davinci/dm646x.c | 8 +++++++-
4 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c
index 9ae049ae816a..495e9293ed2a 100644
--- a/arch/arm/mach-davinci/devices-da8xx.c
+++ b/arch/arm/mach-davinci/devices-da8xx.c
@@ -213,21 +213,29 @@ static struct resource da850_edma1_resources[] = {
},
};
+static u64 da8xx_edma0_dmamask = DMA_BIT_MASK(32);
+
static struct platform_device da8xx_edma0_device = {
.name = "edma",
.id = 0,
.dev = {
.platform_data = &da8xx_edma0_pdata,
+ .dma_mask = &da8xx_edma0_dmamask,
+ .coherent_dma_mask = DMA_BIT_MASK(32),
},
.num_resources = ARRAY_SIZE(da8xx_edma0_resources),
.resource = da8xx_edma0_resources,
};
+static u64 da850_edma1_dmamask = DMA_BIT_MASK(32);
+
static struct platform_device da850_edma1_device = {
.name = "edma",
.id = 1,
.dev = {
.platform_data = &da850_edma1_pdata,
+ .dma_mask = &da850_edma1_dmamask,
+ .coherent_dma_mask = DMA_BIT_MASK(32),
},
.num_resources = ARRAY_SIZE(da850_edma1_resources),
.resource = da850_edma1_resources,
diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index a50bb9c66952..0f8c0ab48872 100644
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -613,10 +613,16 @@ static struct resource edma_resources[] = {
/* not using (or muxing) TC*_ERR */
};
+static u64 dm355_edma_dmamask = DMA_BIT_MASK(32);
+
static struct platform_device dm355_edma_device = {
.name = "edma",
.id = 0,
- .dev.platform_data = &dm355_edma_pdata,
+ .dev = {
+ .platform_data = &dm355_edma_pdata,
+ .dma_mask = &dm355_edma_dmamask,
+ .coherent_dma_mask = DMA_BIT_MASK(32),
+ },
.num_resources = ARRAY_SIZE(edma_resources),
.resource = edma_resources,
};
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index d759ca8e58e8..fc8950e5a9a0 100644
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -542,10 +542,16 @@ static struct resource edma_resources[] = {
/* not using TC*_ERR */
};
+static u64 dm644x_edma_dmamask = DMA_BIT_MASK(32);
+
static struct platform_device dm644x_edma_device = {
.name = "edma",
.id = 0,
- .dev.platform_data = &dm644x_edma_pdata,
+ .dev = {
+ .platform_data = &dm644x_edma_pdata,
+ .dma_mask = &dm644x_edma_dmamask,
+ .coherent_dma_mask = DMA_BIT_MASK(32),
+ },
.num_resources = ARRAY_SIZE(edma_resources),
.resource = edma_resources,
};
diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
index 219ebc8f674a..77df905949bc 100644
--- a/arch/arm/mach-davinci/dm646x.c
+++ b/arch/arm/mach-davinci/dm646x.c
@@ -589,10 +589,16 @@ static struct resource edma_resources[] = {
/* not using TC*_ERR */
};
+static u64 dm646x_edma_dmamask = DMA_BIT_MASK(32);
+
static struct platform_device dm646x_edma_device = {
.name = "edma",
.id = 0,
- .dev.platform_data = &dm646x_edma_pdata,
+ .dev = {
+ .platform_data = &dm646x_edma_pdata,
+ .dma_mask = &dm646x_edma_dmamask,
+ .coherent_dma_mask = DMA_BIT_MASK(32),
+ },
.num_resources = ARRAY_SIZE(edma_resources),
.resource = edma_resources,
};
--
2.5.1
next prev parent reply other threads:[~2015-09-10 8:37 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-10 8:37 [PATCH 00/21] dmaengine/ARM: Merge the edma drivers into one Peter Ujfalusi
2015-09-10 8:37 ` [PATCH 01/21] ARM: common: edma: Fix channel parameter for irq callbacks Peter Ujfalusi
2015-09-10 8:37 ` [PATCH 02/21] ARM: common: edma: Remove unused functions Peter Ujfalusi
2015-09-10 8:37 ` [PATCH 03/21] dmaengine: edma: Simplify and optimize the edma_execute path Peter Ujfalusi
2015-09-10 8:37 ` [PATCH 04/21] ARM: davinci/common: Convert edma driver to handle one eDMA instance per driver Peter Ujfalusi
2015-09-10 8:37 ` [PATCH 05/21] ARM/dmaengine: edma: Move of_dma_controller_register to the dmaengine driver Peter Ujfalusi
2015-09-10 8:37 ` [PATCH 06/21] ARM: common: edma: Internal API to use pointer to 'struct edma' Peter Ujfalusi
2015-09-10 8:37 ` [PATCH 07/21] ARM/dmaengine: edma: Public API to use private struct pointer Peter Ujfalusi
2015-09-10 8:37 ` [PATCH 08/21] ARM/dmaengine: edma: Remove limitation on the number of eDMA controllers Peter Ujfalusi
2015-09-10 8:40 ` Arnd Bergmann
2015-09-10 9:09 ` Peter Ujfalusi
2015-09-10 8:37 ` Peter Ujfalusi [this message]
2015-09-10 8:45 ` [PATCH 09/21] ARM: davinci: Add set dma_mask to eDMA devices Arnd Bergmann
2015-09-10 9:13 ` Peter Ujfalusi
2015-09-10 8:37 ` [PATCH 10/21] ARM/dmaengine: edma: Merge the two drivers under drivers/dmaengine Peter Ujfalusi
2015-09-10 8:37 ` [PATCH 11/21] dmaengine: edma: Allocate memory dynamically for bitmaps and structures Peter Ujfalusi
2015-09-10 8:37 ` [PATCH 12/21] dmaengine: edma: Parameter alignment and long line fixes Peter Ujfalusi
2015-09-10 8:37 ` [PATCH 13/21] dmaengine: edma: Use devm_kcalloc when possible Peter Ujfalusi
2015-09-10 8:37 ` [PATCH 14/21] dmaengine: edma: Cleanup regarding the use of dev around the code Peter Ujfalusi
2015-09-10 8:37 ` [PATCH 15/21] dmaengine: edma: Use dev_dbg instead pr_debug Peter Ujfalusi
2015-09-10 8:37 ` [PATCH 16/21] dmaengine: edma: Use the edma_write_slot instead open coded memcpy_toio Peter Ujfalusi
2015-09-10 8:37 ` [PATCH 17/21] dmaengine: edma: Print warning when linking slots from different eDMA Peter Ujfalusi
2015-09-10 8:37 ` [PATCH 18/21] dmaengine: edma: Consolidate the comments for functions Peter Ujfalusi
2015-09-10 8:37 ` [PATCH 19/21] dmaengine: edma: Simplify the interrupt handling Peter Ujfalusi
2015-09-10 8:37 ` [PATCH 20/21] dmaengine: edma: Move the pending error check into helper function Peter Ujfalusi
2015-09-10 8:37 ` [PATCH 21/21] dmaengine: edma: Simplify and optimize ccerr interrupt handler Peter Ujfalusi
2015-09-10 8:47 ` [PATCH 00/21] dmaengine/ARM: Merge the edma drivers into one Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1441874270-2399-10-git-send-email-peter.ujfalusi@ti.com \
--to=peter.ujfalusi@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox