aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/at91/patches-5.10/134-dmaengine-at_xdmac-add-AXI-priority-support-and-reco.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2022-04-27 14:14:45 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2022-05-01 14:13:15 +0200
commitd90c7621f40fde2dd01d08b4463cde755173b6ed (patch)
tree022690f0e7d53e5a60124848a61fa0e0a9120a99 /target/linux/at91/patches-5.10/134-dmaengine-at_xdmac-add-AXI-priority-support-and-reco.patch
parente9c14fa85f4d517ad1729b4b2a1a5ba1b316f189 (diff)
downloadupstream-d90c7621f40fde2dd01d08b4463cde755173b6ed.tar.gz
upstream-d90c7621f40fde2dd01d08b4463cde755173b6ed.tar.bz2
upstream-d90c7621f40fde2dd01d08b4463cde755173b6ed.zip
kernel: bump 5.10 to 5.10.113
All patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Signed-off-by: John Audia <graysky@archlinux.us> (cherry picked from commit e08942e76a162962892020a0f7e52ef751ec68e4)
Diffstat (limited to 'target/linux/at91/patches-5.10/134-dmaengine-at_xdmac-add-AXI-priority-support-and-reco.patch')
-rw-r--r--target/linux/at91/patches-5.10/134-dmaengine-at_xdmac-add-AXI-priority-support-and-reco.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/at91/patches-5.10/134-dmaengine-at_xdmac-add-AXI-priority-support-and-reco.patch b/target/linux/at91/patches-5.10/134-dmaengine-at_xdmac-add-AXI-priority-support-and-reco.patch
index 50a0cfc3b5..faca34ff09 100644
--- a/target/linux/at91/patches-5.10/134-dmaengine-at_xdmac-add-AXI-priority-support-and-reco.patch
+++ b/target/linux/at91/patches-5.10/134-dmaengine-at_xdmac-add-AXI-priority-support-and-reco.patch
@@ -71,7 +71,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
};
static inline void __iomem *at_xdmac_chan_reg_base(struct at_xdmac *atxdmac, unsigned int chan_nb)
-@@ -1996,6 +2017,30 @@ static int atmel_xdmac_resume(struct dev
+@@ -1998,6 +2019,30 @@ static int atmel_xdmac_resume(struct dev
}
#endif /* CONFIG_PM_SLEEP */
@@ -102,7 +102,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
static int at_xdmac_probe(struct platform_device *pdev)
{
struct at_xdmac *atxdmac;
-@@ -2140,6 +2185,8 @@ static int at_xdmac_probe(struct platfor
+@@ -2142,6 +2187,8 @@ static int at_xdmac_probe(struct platfor
dev_info(&pdev->dev, "%d channels, mapped at 0x%p\n",
nr_channels, atxdmac->regs);