aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/806-dma-0004-MLK-15003-1-DMA-fsl-edma-v3-add-one-more-parameter-f.patch
diff options
context:
space:
mode:
authorYangbo Lu <yangbo.lu@nxp.com>2020-04-10 10:47:05 +0800
committerPetr Štetiar <ynezz@true.cz>2020-05-07 12:53:06 +0200
commitcddd4591404fb4c53dc0b3c0b15b942cdbed4356 (patch)
tree392c1179de46b0f804e3789edca19069b64e6b44 /target/linux/layerscape/patches-5.4/806-dma-0004-MLK-15003-1-DMA-fsl-edma-v3-add-one-more-parameter-f.patch
parentd1d2c0b5579ea4f69a42246c9318539d61ba1999 (diff)
downloadupstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.gz
upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.bz2
upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.zip
layerscape: add patches-5.4
Add patches for linux-5.4. The patches are from NXP LSDK-20.04 release which was tagged LSDK-20.04-V5.4. https://source.codeaurora.org/external/qoriq/qoriq-components/linux/ For boards LS1021A-IOT, and Traverse-LS1043 which are not involved in LSDK, port the dts patches from 4.14. The patches are sorted into the following categories: 301-arch-xxxx 302-dts-xxxx 303-core-xxxx 701-net-xxxx 801-audio-xxxx 802-can-xxxx 803-clock-xxxx 804-crypto-xxxx 805-display-xxxx 806-dma-xxxx 807-gpio-xxxx 808-i2c-xxxx 809-jailhouse-xxxx 810-keys-xxxx 811-kvm-xxxx 812-pcie-xxxx 813-pm-xxxx 814-qe-xxxx 815-sata-xxxx 816-sdhc-xxxx 817-spi-xxxx 818-thermal-xxxx 819-uart-xxxx 820-usb-xxxx 821-vfio-xxxx Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/806-dma-0004-MLK-15003-1-DMA-fsl-edma-v3-add-one-more-parameter-f.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/806-dma-0004-MLK-15003-1-DMA-fsl-edma-v3-add-one-more-parameter-f.patch53
1 files changed, 53 insertions, 0 deletions
diff --git a/target/linux/layerscape/patches-5.4/806-dma-0004-MLK-15003-1-DMA-fsl-edma-v3-add-one-more-parameter-f.patch b/target/linux/layerscape/patches-5.4/806-dma-0004-MLK-15003-1-DMA-fsl-edma-v3-add-one-more-parameter-f.patch
new file mode 100644
index 0000000000..1af6c7e79d
--- /dev/null
+++ b/target/linux/layerscape/patches-5.4/806-dma-0004-MLK-15003-1-DMA-fsl-edma-v3-add-one-more-parameter-f.patch
@@ -0,0 +1,53 @@
+From f8692ecd13a787c51eca9234312f5f3fd163a04a Mon Sep 17 00:00:00 2001
+From: Shengjiu Wang <shengjiu.wang@freescale.com>
+Date: Mon, 5 Jun 2017 11:05:52 +0800
+Subject: [PATCH] MLK-15003-1: DMA: fsl-edma-v3: add one more parameter for
+ xlate
+
+The parameter is "is_remote", which is to use remote access for
+edma, the default access is local access.
+
+Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
+(cherry picked from commit eee976b30b0523680f30e762742984f5b5a01b97)
+---
+ drivers/dma/fsl-edma-v3.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+--- a/drivers/dma/fsl-edma-v3.c
++++ b/drivers/dma/fsl-edma-v3.c
+@@ -139,6 +139,7 @@ struct fsl_edma3_chan {
+ int hw_chanid;
+ int priority;
+ int is_rxchan;
++ int is_remote;
+ struct dma_pool *tcd_pool;
+ u32 chn_real_count;
+ char txirq_name[32];
+@@ -189,6 +190,10 @@ static void fsl_edma3_enable_request(str
+ else
+ val |= EDMA_CH_SBR_WR;
+ }
++
++ if (fsl_chan->is_remote)
++ val &= ~(EDMA_CH_SBR_RD | EDMA_CH_SBR_WR);
++
+ writel(val, addr + EDMA_CH_SBR);
+
+ val = readl(addr + EDMA_CH_CSR);
+@@ -686,7 +691,7 @@ static struct dma_chan *fsl_edma3_xlate(
+ struct dma_chan *chan, *_chan;
+ struct fsl_edma3_chan *fsl_chan;
+
+- if (dma_spec->args_count != 3)
++ if (dma_spec->args_count != 4)
+ return NULL;
+
+ mutex_lock(&fsl_edma3->fsl_edma3_mutex);
+@@ -701,6 +706,7 @@ static struct dma_chan *fsl_edma3_xlate(
+ chan->device->privatecnt++;
+ fsl_chan->priority = dma_spec->args[1];
+ fsl_chan->is_rxchan = dma_spec->args[2];
++ fsl_chan->is_remote = dma_spec->args[3];
+ mutex_unlock(&fsl_edma3->fsl_edma3_mutex);
+ return chan;
+ }