diff options
Diffstat (limited to 'target/linux/brcm2708')
2 files changed, 4 insertions, 43 deletions
diff --git a/target/linux/brcm2708/patches-4.9/950-0019-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch b/target/linux/brcm2708/patches-4.9/950-0019-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch index e800713ab8..c402fe283b 100644 --- a/target/linux/brcm2708/patches-4.9/950-0019-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch +++ b/target/linux/brcm2708/patches-4.9/950-0019-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch @@ -46,7 +46,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org> struct bcm2835_dmadev { struct dma_device ddev; -@@ -922,6 +924,9 @@ static int bcm2835_dma_probe(struct plat +@@ -925,6 +927,9 @@ static int bcm2835_dma_probe(struct plat base = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(base)) return PTR_ERR(base); @@ -56,7 +56,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org> od->base = base; -@@ -959,6 +964,9 @@ static int bcm2835_dma_probe(struct plat +@@ -962,6 +967,9 @@ static int bcm2835_dma_probe(struct plat goto err_no_dma; } @@ -66,7 +66,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org> /* get irqs for each channel that we support */ for (i = 0; i <= BCM2835_DMA_MAX_DMA_CHAN_SUPPORTED; i++) { /* skip masked out channels */ -@@ -1033,6 +1041,7 @@ static int bcm2835_dma_remove(struct pla +@@ -1036,6 +1044,7 @@ static int bcm2835_dma_remove(struct pla { struct bcm2835_dmadev *od = platform_get_drvdata(pdev); @@ -74,7 +74,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org> dma_async_device_unregister(&od->ddev); bcm2835_dma_free(od); -@@ -1048,7 +1057,22 @@ static struct platform_driver bcm2835_dm +@@ -1051,7 +1060,22 @@ static struct platform_driver bcm2835_dm }, }; diff --git a/target/linux/brcm2708/patches-4.9/950-0187-dmaengine-bcm2835-Fix-cyclic-DMA-period-splitting.patch b/target/linux/brcm2708/patches-4.9/950-0187-dmaengine-bcm2835-Fix-cyclic-DMA-period-splitting.patch deleted file mode 100644 index fa0d998a2d..0000000000 --- a/target/linux/brcm2708/patches-4.9/950-0187-dmaengine-bcm2835-Fix-cyclic-DMA-period-splitting.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 9fd7a158ec098ab05b8d3ec2c2973b3dc7e498f3 Mon Sep 17 00:00:00 2001 -From: Matthias Reichl <hias@horus.com> -Date: Mon, 20 Feb 2017 20:01:16 +0100 -Subject: [PATCH] dmaengine: bcm2835: Fix cyclic DMA period splitting - -The code responsible for splitting periods into chunks that -can be handled by the DMA controller missed to update total_len, -the number of bytes processed in the current period, when there -are more chunks to follow. - -Therefore total_len was stuck at 0 and the code didn't work at all. -This resulted in a wrong control block layout and audio issues because -the cyclic DMA callback wasn't executing on period boundaries. - -Fix this by adding the missing total_len update. - -Signed-off-by: Matthias Reichl <hias@horus.com> -Signed-off-by: Martin Sperl <kernel@martin.sperl.org> -Tested-by: Clive Messer <clive.messer@digitaldreamtime.co.uk> -Reviewed-by: Eric Anholt <eric@anholt.net> ---- - drivers/dma/bcm2835-dma.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - ---- a/drivers/dma/bcm2835-dma.c -+++ b/drivers/dma/bcm2835-dma.c -@@ -253,8 +253,11 @@ static void bcm2835_dma_create_cb_set_le - */ - - /* have we filled in period_length yet? */ -- if (*total_len + control_block->length < period_len) -+ if (*total_len + control_block->length < period_len) { -+ /* update number of bytes in this period so far */ -+ *total_len += control_block->length; - return; -+ } - - /* calculate the length that remains to reach period_length */ - control_block->length = period_len - *total_len; |