summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorNarayanan G <narayanan.gopalakrishnan@stericsson.com>2011-11-30 19:20:42 +0530
committerVinod Koul <vinod.koul@linux.intel.com>2011-12-05 09:16:59 +0530
commit5cd326fd27da347925019fcc041b79bad8dd55ed (patch)
tree31a5a60de3c58367d5f5e538a6d7aa4b56055fa3 /arch
parent8f0d30f9ee333f4fb3458a9a33f7ead5269ea8f3 (diff)
downloadlinux-stable-5cd326fd27da347925019fcc041b79bad8dd55ed.tar.gz
linux-stable-5cd326fd27da347925019fcc041b79bad8dd55ed.tar.bz2
linux-stable-5cd326fd27da347925019fcc041b79bad8dd55ed.zip
dmaengine/ste_dma40: allow fixed physical channel
Allow logical channels to specify the physical channel they want to use. This is needed to avoid two peripherals operating on the same physical channel during some special use-cases. (like mmc and usb during a usb mass storage case). Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> Signed-off-by: Narayanan G <narayanan.gopalakrishnan@stericsson.com> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/plat-nomadik/include/plat/ste_dma40.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/plat-nomadik/include/plat/ste_dma40.h b/arch/arm/plat-nomadik/include/plat/ste_dma40.h
index 3177bed253df..fd0ee84c45d1 100644
--- a/arch/arm/plat-nomadik/include/plat/ste_dma40.h
+++ b/arch/arm/plat-nomadik/include/plat/ste_dma40.h
@@ -113,7 +113,8 @@ struct stedma40_half_channel_info {
* @dst_dev_type: Dst device type
* @src_info: Parameters for dst half channel
* @dst_info: Parameters for dst half channel
- *
+ * @use_fixed_channel: if true, use physical channel specified by phy_channel
+ * @phy_channel: physical channel to use, only if use_fixed_channel is true
*
* This structure has to be filled by the client drivers.
* It is recommended to do all dma configurations for clients in the machine.
@@ -129,6 +130,9 @@ struct stedma40_chan_cfg {
int dst_dev_type;
struct stedma40_half_channel_info src_info;
struct stedma40_half_channel_info dst_info;
+
+ bool use_fixed_channel;
+ int phy_channel;
};
/**