2016-09-10 12:54:26 +00:00
|
|
|
From 31c4d45f25abd0680e05775f3166ec6066e39a2a Mon Sep 17 00:00:00 2001
|
2016-07-07 07:22:07 +00:00
|
|
|
From: Martin Sperl <kernel@martin.sperl.org>
|
|
|
|
|
Date: Fri, 22 Apr 2016 17:17:22 +0000
|
2016-09-10 12:54:26 +00:00
|
|
|
Subject: [PATCH] Revert "bcm2835-dma: Limit cyclic transfers on lite channels
|
|
|
|
|
to 32k"
|
2016-07-07 07:22:07 +00:00
|
|
|
|
|
|
|
|
This reverts commit 052c2005b6ecedc5abad86632f5781adda310aa7.
|
|
|
|
|
---
|
|
|
|
|
drivers/dma/bcm2835-dma.c | 8 +-------
|
|
|
|
|
1 file changed, 1 insertion(+), 7 deletions(-)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/dma/bcm2835-dma.c
|
|
|
|
|
+++ b/drivers/dma/bcm2835-dma.c
|
|
|
|
|
@@ -144,12 +144,6 @@ struct bcm2835_desc {
|
|
|
|
|
*/
|
|
|
|
|
#define MAX_LITE_TRANSFER (SZ_64K - 4)
|
|
|
|
|
|
|
|
|
|
-/*
|
|
|
|
|
- * Transfers larger than 32k cause issues with the bcm2708-i2s driver,
|
|
|
|
|
- * so limit transfer size to 32k as bcm2708-dmaengine did.
|
|
|
|
|
- */
|
|
|
|
|
-#define MAX_CYCLIC_LITE_TRANSFER SZ_32K
|
|
|
|
|
-
|
|
|
|
|
static inline struct bcm2835_dmadev *to_bcm2835_dma_dev(struct dma_device *d)
|
|
|
|
|
{
|
|
|
|
|
return container_of(d, struct bcm2835_dmadev, ddev);
|
|
|
|
|
@@ -418,7 +412,7 @@ static struct dma_async_tx_descriptor *b
|
|
|
|
|
d->c = c;
|
|
|
|
|
d->dir = direction;
|
|
|
|
|
if (c->ch >= 8) /* LITE channel */
|
|
|
|
|
- max_size = MAX_CYCLIC_LITE_TRANSFER;
|
|
|
|
|
+ max_size = MAX_LITE_TRANSFER;
|
|
|
|
|
else
|
|
|
|
|
max_size = MAX_NORMAL_TRANSFER;
|
|
|
|
|
period_len = min(period_len, max_size);
|
