From: Joel A Fernandes <joelagnel@ti.com>
To: Tony Lindgren <tony@atomide.com>, Sekhar Nori <nsekhar@ti.com>,
Matt Porter <matt@ohporter.com>,
Grant Likely <grant.likely@secretlab.ca>,
Rob Herring <rob.herring@calxeda.com>,
Vinod Koul <vinod.koul@intel.com>,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
Benoit Cousson <b-cousson@ti.com>,
Russell King <linux@arm.linux.org.uk>,
Rob Landley <rob@landley.net>,
Andrew Morton <akpm@linux-foundation.org>,
Jason Kridner <jkridner@beagleboard.org>,
Koen Kooi <koen@beagleboard.org>
Cc: Devicetree Discuss <devicetree-discuss@lists.ozlabs.org>,
Linux OMAP List <linux-omap@vger.kernel.org>,
Linux ARM Kernel List <linux-arm-kernel@lists.infradead.org>,
Linux DaVinci Kernel List
<davinci-linux-open-source@linux.davincidsp.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Documentation List <linux-doc@vger.kernel.org>,
Linux MMC List <linux-mmc@vger.kernel.org>,
Linux SPI Devel List <spi-devel-general@lists.sourceforge.net>,
Arnd Bergmann <arnd@arndb.de>,
Joel A Fernandes <joelagnel@ti.com>
Subject: [PATCH v12 03/11] ARM: edma: Add EDMA crossbar event mux support
Date: Thu, 20 Jun 2013 16:06:39 -0500 [thread overview]
Message-ID: <1371762407-24544-4-git-send-email-joelagnel@ti.com> (raw)
In-Reply-To: <1371762407-24544-1-git-send-email-joelagnel@ti.com>
From: Matt Porter <mporter@ti.com>
Changes by Joel:
* Split EDMA xbar support out of original EDMA DT parsing patch
to keep it easier for review.
* Rewrite shift and offset calculation.
Suggested-by: Sekhar Nori <nsekhar@ti.com>
Suggested by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Joel A Fernandes <joelagnel@ti.com>
Reference:
[1] https://patchwork.kernel.org/patch/2226991/
---
arch/arm/common/edma.c | 62 +++++++++++++++++++++++++++++++++++-
include/linux/platform_data/edma.h | 1 +
2 files changed, 62 insertions(+), 1 deletion(-)
diff --git a/arch/arm/common/edma.c b/arch/arm/common/edma.c
index 407e01e..a03d4f0 100644
--- a/arch/arm/common/edma.c
+++ b/arch/arm/common/edma.c
@@ -568,7 +568,7 @@ static int prepare_unused_channel_list(struct device *dev, void *data)
(int)pdev->resource[i].start >= 0) {
ctlr = EDMA_CTLR(pdev->resource[i].start);
clear_bit(EDMA_CHAN_SLOT(pdev->resource[i].start),
- edma_cc[ctlr]->edma_unused);
+ edma_cc[ctlr]->edma_unused);
}
}
@@ -1393,6 +1393,52 @@ static int edma_of_read_u32_to_s16_array(const struct device_node *np,
return 0;
}
+static int edma_xbar_event_map(struct device *dev,
+ struct device_node *node,
+ struct edma_soc_info *pdata, int len)
+{
+ int ret = 0;
+ int i;
+ struct resource res;
+ void __iomem *xbar;
+ const s16 (*xbar_chans)[2];
+ u32 shift, offset, mux;
+
+ xbar_chans = devm_kzalloc(dev,
+ len/sizeof(s16) + 2*sizeof(s16),
+ GFP_KERNEL);
+ if (!xbar_chans)
+ return -ENOMEM;
+
+ ret = of_address_to_resource(node, 1, &res);
+ if (ret)
+ return -EIO;
+
+ xbar = devm_ioremap(dev, res.start, resource_size(&res));
+ if (!xbar)
+ return -ENOMEM;
+
+ ret = edma_of_read_u32_to_s16_array(node,
+ "ti,edma-xbar-event-map",
+ (s16 *)xbar_chans,
+ len/sizeof(u32));
+ if (ret)
+ return -EIO;
+
+ for (i = 0; xbar_chans[i][0] != -1; i++) {
+ shift = (xbar_chans[i][1] & 0x03) << 3;
+ offset = xbar_chans[i][1] & 0xfffffffc;
+ mux = readl(xbar + offset);
+ mux &= ~(0xff << shift);
+ mux |= xbar_chans[i][0] << shift;
+ writel(mux, (xbar + offset));
+ }
+
+ pdata->xbar_chans = xbar_chans;
+
+ return 0;
+}
+
static int edma_of_parse_dt(struct device *dev,
struct device_node *node,
struct edma_soc_info *pdata)
@@ -1458,6 +1504,10 @@ static int edma_of_parse_dt(struct device *dev,
pdata->default_queue = 0;
+ prop = of_find_property(node, "ti,edma-xbar-event-map", &sz);
+ if (prop)
+ ret = edma_xbar_event_map(dev, node, pdata, sz);
+
return ret;
}
@@ -1476,6 +1526,7 @@ static int edma_probe(struct platform_device *pdev)
int status = -1;
const s16 (*rsv_chans)[2];
const s16 (*rsv_slots)[2];
+ const s16 (*xbar_chans)[2];
int irq[EDMA_MAX_CC] = {0, 0};
int err_irq[EDMA_MAX_CC] = {0, 0};
struct resource *r[EDMA_MAX_CC] = {NULL};
@@ -1591,6 +1642,15 @@ static int edma_probe(struct platform_device *pdev)
}
}
+ /* Clear the xbar mapped channels in unused list */
+ xbar_chans = info[j]->xbar_chans;
+ if (xbar_chans) {
+ for (i = 0; xbar_chans[i][1] != -1; i++) {
+ off = xbar_chans[i][1];
+ clear_bits(off, 1,
+ edma_cc[j]->edma_unused);
+ }
+ }
if (node) {
irq[j] = irq_of_parse_and_map(node, 0);
diff --git a/include/linux/platform_data/edma.h b/include/linux/platform_data/edma.h
index 317f2be..57300fd 100644
--- a/include/linux/platform_data/edma.h
+++ b/include/linux/platform_data/edma.h
@@ -177,6 +177,7 @@ struct edma_soc_info {
s8 (*queue_tc_mapping)[2];
s8 (*queue_priority_mapping)[2];
+ const s16 (*xbar_chans)[2];
};
#endif
--
1.7.9.5
next prev parent reply other threads:[~2013-06-20 21:10 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-20 21:06 [PATCH v12 00/11] DMA Engine support for AM33XX Joel A Fernandes
2013-06-20 21:06 ` [PATCH v12 01/11] dmaengine: edma: Add TI EDMA device tree binding Joel A Fernandes
2013-06-20 21:06 ` [PATCH v12 02/11] ARM: edma: Add DT and runtime PM support to the private EDMA API Joel A Fernandes
2013-06-21 9:37 ` Sekhar Nori
2013-06-21 9:53 ` [PATCH v13] " Sekhar Nori
2013-06-24 10:06 ` Sekhar Nori
2013-06-21 13:37 ` [PATCH v12 02/11] " Joel A Fernandes
2013-06-20 21:06 ` Joel A Fernandes [this message]
2013-06-21 10:12 ` [PATCH v12 03/11] ARM: edma: Add EDMA crossbar event mux support Sekhar Nori
2013-06-21 10:14 ` [PATCH] " Sekhar Nori
2013-06-20 21:06 ` [PATCH v12 04/11] dmaengine: edma: enable build for AM33XX Joel A Fernandes
2013-06-21 10:15 ` Sekhar Nori
2013-06-24 10:17 ` Tony Lindgren
2013-06-24 10:31 ` Sekhar Nori
2013-06-20 21:06 ` [PATCH v12 05/11] edma: config: Enable config options for EDMA Joel A Fernandes
2013-06-21 10:16 ` Sekhar Nori
2013-06-21 13:52 ` Joel A Fernandes
2013-06-21 14:00 ` Arnd Bergmann
2013-06-21 14:20 ` Joel A Fernandes
2013-06-21 14:32 ` Arnd Bergmann
2013-06-21 18:40 ` Joel A Fernandes
2013-06-21 18:44 ` Arnd Bergmann
2013-06-21 21:53 ` Joel A Fernandes
2013-06-21 22:14 ` Arnd Bergmann
2013-06-22 2:53 ` Joel A Fernandes
2013-06-24 11:53 ` Sekhar Nori
2013-06-24 14:48 ` Joel A Fernandes
2013-06-24 20:28 ` Arnd Bergmann
2013-06-24 20:32 ` Joel A Fernandes
2013-06-24 21:07 ` Arnd Bergmann
2013-06-24 21:09 ` Fernandes, Joel A
2013-06-24 11:23 ` Sekhar Nori
2013-06-24 11:34 ` Sekhar Nori
2013-06-24 20:10 ` Joel A Fernandes
2013-06-20 21:06 ` [PATCH v12 06/11] da8xx: config: Enable MMC and FS options Joel A Fernandes
2013-06-20 21:06 ` [PATCH v12 07/11] ARM: davinci: Fix compiler warnings in devices-da8xx Joel A Fernandes
2013-06-20 21:06 ` [PATCH v12 08/11] spi: omap2-mcspi: add generic DMA request support to the DT binding Joel A Fernandes
2013-06-21 10:35 ` Sourav Poddar
2013-06-20 21:06 ` [PATCH v12 09/11] spi: omap2-mcspi: convert to dma_request_slave_channel_compat() Joel A Fernandes
2013-06-21 10:26 ` Sourav Poddar
2013-06-21 10:37 ` Sekhar Nori
2013-06-21 11:28 ` Mark Brown
2013-06-21 12:22 ` Sourav Poddar
2013-06-20 21:06 ` [PATCH v12 10/11] ARM: dts: add AM33XX EDMA support Joel A Fernandes
2013-08-19 14:22 ` Sebastian Andrzej Siewior
2013-06-20 21:06 ` [PATCH v12 11/11] ARM: dts: add AM33XX SPI DMA support Joel A Fernandes
2013-06-21 10:27 ` [PATCH v12 00/11] DMA Engine support for AM33XX Sekhar Nori
2013-06-22 0:07 ` Joel A Fernandes
2013-06-22 3:36 ` Joel A Fernandes
2013-06-24 10:19 ` Tony Lindgren
2013-06-24 11:39 ` Sekhar Nori
2013-06-24 11:48 ` Sourav Poddar
2013-06-24 14:36 ` Benoit Cousson
2013-06-25 6:54 ` Tony Lindgren
2013-06-25 14:16 ` Sekhar Nori
2013-06-25 14:42 ` Santosh Shilimkar
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=1371762407-24544-4-git-send-email-joelagnel@ti.com \
--to=joelagnel@ti.com \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=b-cousson@ti.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=davinci-linux-open-source@linux.davincidsp.com \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=grant.likely@secretlab.ca \
--cc=jkridner@beagleboard.org \
--cc=koen@beagleboard.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=matt@ohporter.com \
--cc=nsekhar@ti.com \
--cc=rob.herring@calxeda.com \
--cc=rob@landley.net \
--cc=spi-devel-general@lists.sourceforge.net \
--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;
as well as URLs for NNTP newsgroup(s).