From: Jamie Iles <jamie@jamieiles.com>
To: linux-kernel@vger.kernel.org
Cc: Jamie Iles <jamie@jamieiles.com>,
Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
Subject: [PATCH 4/4] avr32: at32ap700x: specify DMA src and dst masters
Date: Tue, 23 Nov 2010 11:06:11 +0000 [thread overview]
Message-ID: <1290510371-23077-5-git-send-email-jamie@jamieiles.com> (raw)
In-Reply-To: <1290510371-23077-1-git-send-email-jamie@jamieiles.com>
Now that the dw_dmac DMA driver supports configurable source and
destination masters we need to specify which ones to use. This was
previously hardcoded to 0 and 1 respectively in the driver.
Cc: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
Signed-off-by: Jamie Iles <jamie@jamieiles.com>
---
arch/avr32/mach-at32ap/at32ap700x.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c
index e67c999..2747cde 100644
--- a/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
@@ -2048,6 +2048,8 @@ at32_add_device_ac97c(unsigned int id, struct ac97c_platform_data *data,
rx_dws->reg_width = DW_DMA_SLAVE_WIDTH_16BIT;
rx_dws->cfg_hi = DWC_CFGH_SRC_PER(3);
rx_dws->cfg_lo &= ~(DWC_CFGL_HS_DST_POL | DWC_CFGL_HS_SRC_POL);
+ rx_dws->src_master = 0;
+ rx_dws->dst_master = 1;
}
/* Check if DMA slave interface for playback should be configured. */
@@ -2056,6 +2058,8 @@ at32_add_device_ac97c(unsigned int id, struct ac97c_platform_data *data,
tx_dws->reg_width = DW_DMA_SLAVE_WIDTH_16BIT;
tx_dws->cfg_hi = DWC_CFGH_DST_PER(4);
tx_dws->cfg_lo &= ~(DWC_CFGL_HS_DST_POL | DWC_CFGL_HS_SRC_POL);
+ rx_dws->src_master = 0;
+ rx_dws->dst_master = 1;
}
if (platform_device_add_data(pdev, data,
@@ -2128,6 +2132,8 @@ at32_add_device_abdac(unsigned int id, struct atmel_abdac_pdata *data)
dws->reg_width = DW_DMA_SLAVE_WIDTH_32BIT;
dws->cfg_hi = DWC_CFGH_DST_PER(2);
dws->cfg_lo &= ~(DWC_CFGL_HS_DST_POL | DWC_CFGL_HS_SRC_POL);
+ dws->src_master = 0;
+ dws->dst_master = 1;
if (platform_device_add_data(pdev, data,
sizeof(struct atmel_abdac_pdata)))
--
1.7.2.3
next prev parent reply other threads:[~2010-11-23 11:06 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-23 11:06 [PATCH 0/4] dmaengine/dw_dmac: enhancements to allow use on other platforms Jamie Iles
2010-11-23 11:06 ` [PATCH 1/4] dmaengine/dw_dmac: don't scan descriptors if no xfers in progress Jamie Iles
2010-12-03 23:20 ` Dan Williams
2010-11-23 11:06 ` [PATCH 2/4] dmaengine/dw_dmac: allow src/dst masters to be configured at runtime Jamie Iles
2010-12-03 23:56 ` Dan Williams
2010-12-08 1:03 ` Dan Williams
2010-12-08 1:20 ` Jamie Iles
2010-12-08 6:41 ` Hans-Christian Egtvedt
2010-12-08 8:09 ` Jamie Iles
2010-11-23 11:06 ` [PATCH 3/4] dmaengine/dw_dmac: provide a mechanism to indicate private devices Jamie Iles
2010-11-23 11:06 ` Jamie Iles [this message]
2010-12-08 12:36 ` [PATCH 4/4] avr32: at32ap700x: specify DMA src and dst masters Hans-Christian Egtvedt
2010-12-03 23:34 ` [PATCH 0/4] dmaengine/dw_dmac: enhancements to allow use on other platforms Dan Williams
2010-12-05 20:05 ` Håvard Skinnemoen
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=1290510371-23077-5-git-send-email-jamie@jamieiles.com \
--to=jamie@jamieiles.com \
--cc=hans-christian.egtvedt@atmel.com \
--cc=linux-kernel@vger.kernel.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
all inboxes | Powered by JetHome®