From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: <nsekhar@ti.com>, <joelf@ti.com>, <arnd@arndb.de>
Cc: <linux@arm.linux.org.uk>, <vinod.koul@intel.com>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>, <linux-omap@vger.kernel.org>,
<devicetree@vger.kernel.org>, <linux-doc@vger.kernel.org>,
<tony@atomide.com>, <bcousson@baylibre.com>
Subject: [PATCH v3 03/13] ARM: edma: Do not change TC -> Queue mapping, leave it to default.
Date: Fri, 16 May 2014 15:17:10 +0300 [thread overview]
Message-ID: <1400242640-9902-4-git-send-email-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <1400242640-9902-1-git-send-email-peter.ujfalusi@ti.com>
There is no need to change the default TC -> Queue mapping. By default the
mapping is: TC0 -> Q0, TC1 -> Q1, etc.
Changing this has no benefits at all and all the board files are just setting
the same mapping back to the HW.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
arch/arm/common/edma.c | 28 +---------------------------
1 file changed, 1 insertion(+), 27 deletions(-)
diff --git a/arch/arm/common/edma.c b/arch/arm/common/edma.c
index d42c84a3432a..0bc5ed6fc249 100644
--- a/arch/arm/common/edma.c
+++ b/arch/arm/common/edma.c
@@ -290,12 +290,6 @@ static void map_dmach_queue(unsigned ctlr, unsigned ch_no,
~(0x7 << bit), queue_no << bit);
}
-static void __init map_queue_tc(unsigned ctlr, int queue_no, int tc_no)
-{
- int bit = queue_no * 4;
- edma_modify(ctlr, EDMA_QUETCMAP, ~(0x7 << bit), ((tc_no & 0x7) << bit));
-}
-
static void __init assign_priority_to_queue(unsigned ctlr, int queue_no,
int priority)
{
@@ -1470,7 +1464,7 @@ static int edma_of_parse_dt(struct device *dev,
struct property *prop;
size_t sz;
struct edma_rsv_info *rsv_info;
- s8 (*queue_tc_map)[2], (*queue_priority_map)[2];
+ s8 (*queue_priority_map)[2];
ret = of_property_read_u32(node, "dma-channels", &value);
if (ret < 0)
@@ -1495,19 +1489,6 @@ static int edma_of_parse_dt(struct device *dev,
return -ENOMEM;
pdata->rsv = rsv_info;
- queue_tc_map = devm_kzalloc(dev, 8*sizeof(s8), GFP_KERNEL);
- if (!queue_tc_map)
- return -ENOMEM;
-
- for (i = 0; i < 3; i++) {
- queue_tc_map[i][0] = i;
- queue_tc_map[i][1] = i;
- }
- queue_tc_map[i][0] = -1;
- queue_tc_map[i][1] = -1;
-
- pdata->queue_tc_mapping = queue_tc_map;
-
queue_priority_map = devm_kzalloc(dev, 8*sizeof(s8), GFP_KERNEL);
if (!queue_priority_map)
return -ENOMEM;
@@ -1568,7 +1549,6 @@ static int edma_probe(struct platform_device *pdev)
struct edma_soc_info **info = pdev->dev.platform_data;
struct edma_soc_info *ninfo[EDMA_MAX_CC] = {NULL};
s8 (*queue_priority_mapping)[2];
- s8 (*queue_tc_mapping)[2];
int i, j, off, ln, found = 0;
int status = -1;
const s16 (*rsv_chans)[2];
@@ -1735,14 +1715,8 @@ static int edma_probe(struct platform_device *pdev)
for (i = 0; i < edma_cc[j]->num_channels; i++)
map_dmach_queue(j, i, info[j]->default_queue);
- queue_tc_mapping = info[j]->queue_tc_mapping;
queue_priority_mapping = info[j]->queue_priority_mapping;
- /* Event queue to TC mapping */
- for (i = 0; queue_tc_mapping[i][0] != -1; i++)
- map_queue_tc(j, queue_tc_mapping[i][0],
- queue_tc_mapping[i][1]);
-
/* Event queue priority mapping */
for (i = 0; queue_priority_mapping[i][0] != -1; i++)
assign_priority_to_queue(j,
--
1.9.3
next prev parent reply other threads:[~2014-05-16 12:21 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-16 12:17 [PATCH v3 00/13] ARM/DT: edma: IP configuration from hardware and cleanups Peter Ujfalusi
2014-05-16 12:17 ` [PATCH v3 01/13] ARM: edma: No need to clean the pdata in edma_of_parse_dt() Peter Ujfalusi
2014-05-16 12:17 ` [PATCH v3 02/13] ARM: edma: Take the number of tc from edma_soc_info (pdata) Peter Ujfalusi
2014-05-19 11:07 ` Sekhar Nori
2014-05-19 16:37 ` Peter Ujfalusi
2014-05-16 12:17 ` Peter Ujfalusi [this message]
2014-05-16 12:17 ` [PATCH v3 04/13] ARM: davinci: Remove eDMA3 queue_tc_mapping data from edma_soc_info Peter Ujfalusi
2014-05-16 12:17 ` [PATCH v3 05/13] ARM/platform_data: edma: Remove " Peter Ujfalusi
2014-05-19 13:02 ` Sekhar Nori
2014-05-16 12:17 ` [PATCH v3 06/13] ARM: edma: Remove num_cc member from struct edma Peter Ujfalusi
2014-05-16 12:17 ` [PATCH v3 07/13] ARM: edma: Save number of regions from pdata to " Peter Ujfalusi
2014-05-16 12:17 ` [PATCH v3 08/13] ARM: edma: Get IP configuration from HW (number of channels, tc, etc) Peter Ujfalusi
2014-05-16 17:33 ` Joel Fernandes
2014-05-16 12:17 ` [PATCH v3 09/13] dt/bindings: ti,edma: Remove redundant properties from documentation Peter Ujfalusi
2014-05-19 8:15 ` Sekhar Nori
2014-05-22 9:53 ` Sekhar Nori
2014-05-16 12:17 ` [PATCH v3 10/13] ARM: dts: am33xx: Remove obsolete properties from edma node Peter Ujfalusi
2014-05-16 15:02 ` Tony Lindgren
2014-05-16 12:17 ` [PATCH v3 11/13] ARM: dts: am4372: " Peter Ujfalusi
2014-05-16 15:02 ` Tony Lindgren
2014-05-16 12:17 ` [PATCH v3 12/13] ARM: davinci: Remove redundant/unused parameters for edma Peter Ujfalusi
2014-05-16 12:17 ` [PATCH v3 13/13] ARM/platform_data: edma: Remove redundant/unused parameters from edma_soc_info Peter Ujfalusi
2014-05-19 13:06 ` [PATCH v3 00/13] ARM/DT: edma: IP configuration from hardware and cleanups Sekhar Nori
2014-05-19 16:53 ` Peter Ujfalusi
2014-05-20 10:56 ` Sekhar Nori
2014-05-22 2:45 ` Vinod Koul
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=1400242640-9902-4-git-send-email-peter.ujfalusi@ti.com \
--to=peter.ujfalusi@ti.com \
--cc=arnd@arndb.de \
--cc=bcousson@baylibre.com \
--cc=devicetree@vger.kernel.org \
--cc=joelf@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=nsekhar@ti.com \
--cc=tony@atomide.com \
--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®