aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/at91/patches-5.10/133-dmaengine-at_xdmac-add-support-for-sama7g5-based-at_.patch
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-07-12 11:51:28 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2022-07-19 21:31:04 +0200
commita51f54b41d7f4009d29d0db1347f1c99775bc6c7 (patch)
treeca2a62150f88efbe342dfc4ebeeb186da7e801ac /target/linux/at91/patches-5.10/133-dmaengine-at_xdmac-add-support-for-sama7g5-based-at_.patch
parentf14122f8e626d032c781f2f3e731207ca8d783ce (diff)
downloadupstream-a51f54b41d7f4009d29d0db1347f1c99775bc6c7.tar.gz
upstream-a51f54b41d7f4009d29d0db1347f1c99775bc6c7.tar.bz2
upstream-a51f54b41d7f4009d29d0db1347f1c99775bc6c7.zip
kernel: bump 5.10 to 5.10.130
All patches automatically rebased. Build system: x86_64 Build-tested: ipq806x/R7800 Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/at91/patches-5.10/133-dmaengine-at_xdmac-add-support-for-sama7g5-based-at_.patch')
-rw-r--r--target/linux/at91/patches-5.10/133-dmaengine-at_xdmac-add-support-for-sama7g5-based-at_.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/at91/patches-5.10/133-dmaengine-at_xdmac-add-support-for-sama7g5-based-at_.patch b/target/linux/at91/patches-5.10/133-dmaengine-at_xdmac-add-support-for-sama7g5-based-at_.patch
index 40d0206b47..6d338490fb 100644
--- a/target/linux/at91/patches-5.10/133-dmaengine-at_xdmac-add-support-for-sama7g5-based-at_.patch
+++ b/target/linux/at91/patches-5.10/133-dmaengine-at_xdmac-add-support-for-sama7g5-based-at_.patch
@@ -256,7 +256,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
clear_bit(AT_XDMAC_CHAN_IS_PAUSED, &atchan->status);
spin_unlock_irqrestore(&atchan->lock, flags);
-@@ -1987,6 +2037,10 @@ static int at_xdmac_probe(struct platfor
+@@ -1992,6 +2042,10 @@ static int at_xdmac_probe(struct platfor
atxdmac->regs = base;
atxdmac->irq = irq;
@@ -267,7 +267,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
atxdmac->clk = devm_clk_get(&pdev->dev, "dma_clk");
if (IS_ERR(atxdmac->clk)) {
dev_err(&pdev->dev, "can't get dma_clk\n");
-@@ -2129,6 +2183,10 @@ static const struct dev_pm_ops atmel_xdm
+@@ -2134,6 +2188,10 @@ static const struct dev_pm_ops atmel_xdm
static const struct of_device_id atmel_xdmac_dt_ids[] = {
{
.compatible = "atmel,sama5d4-dma",