aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorNarayanan G <narayanan.gopalakrishnan@stericsson.com>2011-11-30 08:50:42 -0500
committerVinod Koul <vinod.koul@linux.intel.com>2011-12-04 22:46:59 -0500
commit5cd326fd27da347925019fcc041b79bad8dd55ed (patch)
tree31a5a60de3c58367d5f5e538a6d7aa4b56055fa3 /arch/arm
parent8f0d30f9ee333f4fb3458a9a33f7ead5269ea8f3 (diff)
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/arm')
-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 {
113 * @dst_dev_type: Dst device type 113 * @dst_dev_type: Dst device type
114 * @src_info: Parameters for dst half channel 114 * @src_info: Parameters for dst half channel
115 * @dst_info: Parameters for dst half channel 115 * @dst_info: Parameters for dst half channel
116 * 116 * @use_fixed_channel: if true, use physical channel specified by phy_channel
117 * @phy_channel: physical channel to use, only if use_fixed_channel is true
117 * 118 *
118 * This structure has to be filled by the client drivers. 119 * This structure has to be filled by the client drivers.
119 * It is recommended to do all dma configurations for clients in the machine. 120 * It is recommended to do all dma configurations for clients in the machine.
@@ -129,6 +130,9 @@ struct stedma40_chan_cfg {
129 int dst_dev_type; 130 int dst_dev_type;
130 struct stedma40_half_channel_info src_info; 131 struct stedma40_half_channel_info src_info;
131 struct stedma40_half_channel_info dst_info; 132 struct stedma40_half_channel_info dst_info;
133
134 bool use_fixed_channel;
135 int phy_channel;
132}; 136};
133 137
134/** 138/**