Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760410AbbLCOeX (ORCPT ); Thu, 3 Dec 2015 09:34:23 -0500 Received: from devils.ext.ti.com ([198.47.26.153]:33038 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760184AbbLCOdz (ORCPT ); Thu, 3 Dec 2015 09:33:55 -0500 From: Peter Ujfalusi To: , , CC: , , , , , Subject: [PATCH 4/4] dmaengine: edma: Add support for DMA filter mapping to slave devices Date: Thu, 3 Dec 2015 16:33:12 +0200 Message-ID: <1449153192-9082-5-git-send-email-peter.ujfalusi@ti.com> X-Mailer: git-send-email 2.6.3 In-Reply-To: <1449153192-9082-1-git-send-email-peter.ujfalusi@ti.com> References: <1449153192-9082-1-git-send-email-peter.ujfalusi@ti.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1939 Lines: 65 Add support for providing device to filter_fn mapping so client drivers can switch to use the dma_request_chan() API. Signed-off-by: Peter Ujfalusi --- drivers/dma/edma.c | 6 ++++++ include/linux/platform_data/edma.h | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c index 0675e268d577..46b305ea0d21 100644 --- a/drivers/dma/edma.c +++ b/drivers/dma/edma.c @@ -2297,6 +2297,12 @@ static int edma_probe(struct platform_device *pdev) edma_set_chmap(&ecc->slave_chans[i], ecc->dummy_slot); } + if (info->slave_map) { + ecc->dma_slave.filter_map.map = info->slave_map; + ecc->dma_slave.filter_map.mapcnt = info->slavecnt; + ecc->dma_slave.filter_map.filter_fn = edma_filter_fn; + } + ret = dma_async_device_register(&ecc->dma_slave); if (ret) { dev_err(dev, "slave ddev registration failed (%d)\n", ret); diff --git a/include/linux/platform_data/edma.h b/include/linux/platform_data/edma.h index e2878baeb90e..105700e62ea1 100644 --- a/include/linux/platform_data/edma.h +++ b/include/linux/platform_data/edma.h @@ -53,12 +53,16 @@ enum dma_event_q { #define EDMA_CTLR(i) ((i) >> 16) #define EDMA_CHAN_SLOT(i) ((i) & 0xffff) +#define EDMA_FILTER_PARAM(ctlr, chan) ((int[]) { EDMA_CTLR_CHAN(ctlr, chan) }) + struct edma_rsv_info { const s16 (*rsv_chans)[2]; const s16 (*rsv_slots)[2]; }; +struct dma_slave_map; + /* platform_data for EDMA driver */ struct edma_soc_info { /* @@ -76,6 +80,9 @@ struct edma_soc_info { s8 (*queue_priority_mapping)[2]; const s16 (*xbar_chans)[2]; + + const struct dma_slave_map *slave_map; + int slavecnt; }; #endif -- 2.6.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/