From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: <vinod.koul@intel.com>, <nsekhar@ti.com>, <linux@arm.linux.org.uk>
Cc: <olof@lixom.net>, <arnd@arndb.de>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>, <linux-omap@vger.kernel.org>,
<dmaengine@vger.kernel.org>
Subject: [PATCH v5 10/24] ARM: davinci: Add dma_mask to eDMA devices
Date: Wed, 14 Oct 2015 14:42:52 +0300 [thread overview]
Message-ID: <1444822986-20562-11-git-send-email-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <1444822986-20562-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>
Acked-by: Sekhar Nori <nsekhar@ti.com>
---
arch/arm/mach-davinci/devices-da8xx.c | 2 ++
arch/arm/mach-davinci/dm355.c | 1 +
arch/arm/mach-davinci/dm644x.c | 1 +
arch/arm/mach-davinci/dm646x.c | 1 +
4 files changed, 5 insertions(+)
diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c
index 9f7d266faa0c..28c90bc372bd 100644
--- a/arch/arm/mach-davinci/devices-da8xx.c
+++ b/arch/arm/mach-davinci/devices-da8xx.c
@@ -216,6 +216,7 @@ static struct resource da850_edma1_resources[] = {
static const struct platform_device_info da8xx_edma0_device __initconst = {
.name = "edma",
.id = 0,
+ .dma_mask = DMA_BIT_MASK(32),
.res = da8xx_edma0_resources,
.num_res = ARRAY_SIZE(da8xx_edma0_resources),
.data = &da8xx_edma0_pdata,
@@ -225,6 +226,7 @@ static const struct platform_device_info da8xx_edma0_device __initconst = {
static const struct platform_device_info da850_edma1_device __initconst = {
.name = "edma",
.id = 1,
+ .dma_mask = DMA_BIT_MASK(32),
.res = da850_edma1_resources,
.num_res = ARRAY_SIZE(da850_edma1_resources),
.data = &da850_edma1_pdata,
diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index 5f10c6695e31..609950b8c191 100644
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -616,6 +616,7 @@ static struct resource edma_resources[] = {
static const struct platform_device_info dm355_edma_device __initconst = {
.name = "edma",
.id = 0,
+ .dma_mask = DMA_BIT_MASK(32),
.res = edma_resources,
.num_res = ARRAY_SIZE(edma_resources),
.data = &dm355_edma_pdata,
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index aa3453b40d5f..d38f5049d56e 100644
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -545,6 +545,7 @@ static struct resource edma_resources[] = {
static const struct platform_device_info dm644x_edma_device __initconst = {
.name = "edma",
.id = 0,
+ .dma_mask = DMA_BIT_MASK(32),
.res = edma_resources,
.num_res = ARRAY_SIZE(edma_resources),
.data = &dm644x_edma_pdata,
diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
index 79c1d8917dd3..70eb42725eec 100644
--- a/arch/arm/mach-davinci/dm646x.c
+++ b/arch/arm/mach-davinci/dm646x.c
@@ -592,6 +592,7 @@ static struct resource edma_resources[] = {
static const struct platform_device_info dm646x_edma_device __initconst = {
.name = "edma",
.id = 0,
+ .dma_mask = DMA_BIT_MASK(32),
.res = edma_resources,
.num_res = ARRAY_SIZE(edma_resources),
.data = &dm646x_edma_pdata,
--
2.6.1
next prev parent reply other threads:[~2015-10-14 11:44 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-14 11:42 [PATCH v5 00/24] dmaengine/ARM: Merge the edma drivers into one Peter Ujfalusi
2015-10-14 11:42 ` [PATCH v5 01/24] ARM: common: edma: Fix channel parameter for irq callbacks Peter Ujfalusi
2015-10-14 11:42 ` [PATCH v5 02/24] ARM: common: edma: Remove unused functions Peter Ujfalusi
2015-10-14 11:42 ` [PATCH v5 03/24] dmaengine: edma: Simplify and optimize the edma_execute path Peter Ujfalusi
2015-10-14 11:42 ` [PATCH v5 04/24] ARM: davinci/common: Convert edma driver to handle one eDMA instance per driver Peter Ujfalusi
2015-10-14 11:42 ` [PATCH v5 05/24] ARM/dmaengine: edma: Move of_dma_controller_register to the dmaengine driver Peter Ujfalusi
2015-10-14 11:42 ` [PATCH v5 06/24] ARM: common: edma: Internal API to use pointer to 'struct edma' Peter Ujfalusi
2015-10-14 11:42 ` [PATCH v5 07/24] ARM/dmaengine: edma: Public API to use private struct pointer Peter Ujfalusi
2015-10-14 11:42 ` [PATCH v5 08/24] ARM/dmaengine: edma: Remove limitation on the number of eDMA controllers Peter Ujfalusi
2015-10-14 11:42 ` [PATCH v5 09/24] ARM: davinci: Use platform_device_register_full() to create pdev for eDMA Peter Ujfalusi
2015-10-14 11:42 ` Peter Ujfalusi [this message]
2015-10-14 11:42 ` [PATCH v5 11/24] ARM/dmaengine: edma: Merge the two drivers under drivers/dma/ Peter Ujfalusi
2015-10-14 11:42 ` [PATCH v5 12/24] dmaengine: edma: Allocate memory dynamically for bitmaps and structures Peter Ujfalusi
2015-10-14 11:42 ` [PATCH v5 13/24] dmaengine: edma: Use devm_kcalloc when possible Peter Ujfalusi
2015-10-14 11:42 ` [PATCH v5 14/24] dmaengine: edma: Cleanup regarding the use of dev around the code Peter Ujfalusi
2015-10-14 11:42 ` [PATCH v5 15/24] dmaengine: edma: Use dev_dbg instead pr_debug Peter Ujfalusi
2015-10-14 11:42 ` [PATCH v5 16/24] dmaengine: edma: Use the edma_write_slot instead open coded memcpy_toio Peter Ujfalusi
2015-10-14 11:42 ` [PATCH v5 17/24] dmaengine: edma: Print warning when linking slots from different eDMA Peter Ujfalusi
2015-10-14 11:43 ` [PATCH v5 18/24] dmaengine: edma: Consolidate the comments for functions Peter Ujfalusi
2015-10-14 11:43 ` [PATCH v5 19/24] dmaengine: edma: Simplify the interrupt handling Peter Ujfalusi
2015-10-14 11:43 ` [PATCH v5 20/24] dmaengine: edma: Move the pending error check into helper function Peter Ujfalusi
2015-10-14 11:43 ` [PATCH v5 21/24] dmaengine: edma: Simplify and optimize ccerr interrupt handler Peter Ujfalusi
2015-10-14 11:43 ` [PATCH v5 22/24] dmaengine: edma: Read channel mapping support only once from HW Peter Ujfalusi
2015-10-14 11:43 ` [PATCH v5 23/24] dmaengine: edma: Rename bitfields for slot and channel usage tracking Peter Ujfalusi
2015-10-14 11:43 ` [PATCH v5 24/24] dmaengine: edma: Dynamic paRAM slot handling if HW supports it Peter Ujfalusi
2015-10-14 14:31 ` [PATCH v5 00/24] dmaengine/ARM: Merge the edma drivers into one Vinod Koul
2015-10-15 7:16 ` Peter Ujfalusi
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=1444822986-20562-11-git-send-email-peter.ujfalusi@ti.com \
--to=peter.ujfalusi@ti.com \
--cc=arnd@arndb.de \
--cc=dmaengine@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=nsekhar@ti.com \
--cc=olof@lixom.net \
--cc=vinod.koul@intel.com \
/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
all inboxes | Powered by JetHome®