summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvinash A <Avinash.a@stericsson.com>2011-08-31 17:13:55 +0530
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:04:54 +0200
commitf48c9a497edeb7f4f906f7bd1b9b5f640f491d03 (patch)
tree97ba2301cad70f3e55ad2e3593da2af3d6172efc
parent1a1e21d521940df262239aa5c7dd6cf04a3c27ed (diff)
ux500: mop500: force SD/MMC and MSP2 TX onto different channels
SD/MMC with event line 1 can be in channel 0 or 1. Force both Rx and Tx onto channel 0. Both will anyway not used at the same time, and with this change channel 1 will be available for MSP2 Tx without sharing. Ref: Commit-id: I0e498c3914815d372aaada540a46d46cf1429244 Signed-off-by: Avinash A <Avinash.a@stericsson.com> Change-Id: I39e7b17191554c1cd106dd119e951964b8d8a827 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/29817 Reviewed-by: Avinash A <avinash.a@stericsson.com> Tested-by: Avinash A <avinash.a@stericsson.com>
-rw-r--r--arch/arm/mach-ux500/board-mop500-msp.c3
-rw-r--r--arch/arm/mach-ux500/board-mop500-sdi.c4
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-msp.c b/arch/arm/mach-ux500/board-mop500-msp.c
index 631dbe30a40..35d8480143f 100644
--- a/arch/arm/mach-ux500/board-mop500-msp.c
+++ b/arch/arm/mach-ux500/board-mop500-msp.c
@@ -165,6 +165,9 @@ static struct stedma40_chan_cfg msp2_dma_tx = {
.src_info.psize = STEDMA40_PSIZE_LOG_4,
.dst_info.psize = STEDMA40_PSIZE_LOG_4,
+ .use_fixed_channel = true,
+ .phy_channel = 1,
+
/* data_width is set during configuration */
};
diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c
index 920251cf834..471aad0ccc4 100644
--- a/arch/arm/mach-ux500/board-mop500-sdi.c
+++ b/arch/arm/mach-ux500/board-mop500-sdi.c
@@ -68,6 +68,8 @@ struct stedma40_chan_cfg mop500_sdi0_dma_cfg_rx = {
.dst_dev_type = STEDMA40_DEV_DST_MEMORY,
.src_info.data_width = STEDMA40_WORD_WIDTH,
.dst_info.data_width = STEDMA40_WORD_WIDTH,
+ .use_fixed_channel = true,
+ .phy_channel = 0,
};
static struct stedma40_chan_cfg mop500_sdi0_dma_cfg_tx = {
@@ -77,6 +79,8 @@ static struct stedma40_chan_cfg mop500_sdi0_dma_cfg_tx = {
.dst_dev_type = DB8500_DMA_DEV29_SD_MM0_TX,
.src_info.data_width = STEDMA40_WORD_WIDTH,
.dst_info.data_width = STEDMA40_WORD_WIDTH,
+ .use_fixed_channel = true,
+ .phy_channel = 0,
};
#endif