drv: fix DMA filter function

The identification comes from the DMA resource configured by SPEC or SVEC. The function was still passing the cset like in the previous implementation. Signed-off-by: Federico Vaga <federico.vaga@cern.ch>

drv: fix DMA filter function
The identification comes from the DMA resource configured by SPEC or SVEC. The function was still passing the cset like in the previous implementation. Signed-off-by: Federico Vaga <federico.vaga@cern.ch>
4d1026b7 · Federico Vaga · 03f5faa2 · 4d1026b7 · 4d1026b7
Commit 4d1026b7 authored Aug 03, 2020 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 2 deletions

fa-dma.c kernel/fa-dma.c +10 -2

fmc-adc-100m14b4cha.h kernel/fmc-adc-100m14b4cha.h +2 -0

No files found.
--- a/kernel/fa-dma.c
+++ b/kernel/fa-dma.c
@@ -406,7 +406,15 @@ static int zfad_dma_start(struct zio_cset *cset)
 	struct dma_slave_config sconfig;
 	dma_cap_mask_t dma_mask;
 	unsigned int data_offset;
-	int err, i;
+	int err, i, dma_dev_id;
+	struct resource *r;
+
+	r = platform_get_resource(fa->pdev, IORESOURCE_DMA, ADC_DMA);
+	if (!r) {
+		dev_err(&fa->pdev->dev, "Can't set find DMA channel\n");
+		return -ENODEV;
+	}
+	dma_dev_id = r->start;

 	err = zfad_wait_idle(cset, 5, 1);
 	if (err) {
@@ -426,7 +434,7 @@ static int zfad_dma_start(struct zio_cset *cset)
 	dma_cap_zero(dma_mask);
 	dma_cap_set(DMA_SLAVE, dma_mask);
 	dma_cap_set(DMA_PRIVATE, dma_mask);
-	dchan = dma_request_channel(dma_mask, fa_dmaengine_filter, cset);
+	dchan = dma_request_channel(dma_mask, fa_dmaengine_filter, &dma_dev_id);
 	if (!dchan) {
 		err = -ENODEV;
 		goto err;

--- a/kernel/fmc-adc-100m14b4cha.h
+++ b/kernel/fmc-adc-100m14b4cha.h
@@ -177,6 +177,8 @@ struct fa_calib {

 extern int fa_enable_test_data_adc;

+#define ADC_DMA 0
+
 enum fa_irq_resource {
 	ADC_IRQ_TRG = 0,
 };