diff options
| author | Luka Perkov <luka.perkov@sartura.hr> | 2016-06-23 13:57:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-23 13:57:21 +0200 |
| commit | 282b917e47d9ae5017e1e426face9b75cb7aabd0 (patch) | |
| tree | 3284ca2d20d9c8d7a4563c6446675c1ecf3feac2 /target/linux/brcm2708/patches-4.4/0230-Revert-bcm2835-dma-Fix-dreq-not-set-for-slave-transf.patch | |
| parent | 34d432b05312de6d9575c559db8209809489096d (diff) | |
| parent | 441a9c879ba6562ea9f431cf33bbb0c0400d5fd0 (diff) | |
| download | master-187ad058-282b917e47d9ae5017e1e426face9b75cb7aabd0.tar.gz master-187ad058-282b917e47d9ae5017e1e426face9b75cb7aabd0.tar.bz2 master-187ad058-282b917e47d9ae5017e1e426face9b75cb7aabd0.zip | |
Merge pull request #11 from wigyori/master
pull req for 4.4.12, ar71xx/mediatek updates, package upgrades
Diffstat (limited to 'target/linux/brcm2708/patches-4.4/0230-Revert-bcm2835-dma-Fix-dreq-not-set-for-slave-transf.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-4.4/0230-Revert-bcm2835-dma-Fix-dreq-not-set-for-slave-transf.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.4/0230-Revert-bcm2835-dma-Fix-dreq-not-set-for-slave-transf.patch b/target/linux/brcm2708/patches-4.4/0230-Revert-bcm2835-dma-Fix-dreq-not-set-for-slave-transf.patch new file mode 100644 index 0000000000..7d56e99033 --- /dev/null +++ b/target/linux/brcm2708/patches-4.4/0230-Revert-bcm2835-dma-Fix-dreq-not-set-for-slave-transf.patch @@ -0,0 +1,32 @@ +From 73667a3e1442c254de183d53492264b19fbe239f Mon Sep 17 00:00:00 2001 +From: HiassofT <github@hias.horus.com> +Date: Wed, 6 Apr 2016 21:45:01 +0200 +Subject: [PATCH 230/381] Revert "bcm2835-dma: Fix dreq not set for slave + transfers" + +This reverts commit 8ad957e866a1fe1450f663f2b00a57d7de44904c. + + + +DMA channels are set in devicetree, thus dreq will be set, + +and this commit is no longer needed. + + + +Signed-off-by: Matthias Reichl <hias@horus.com> +--- + drivers/dma/bcm2835-dma.c | 2 -- + 1 file changed, 2 deletions(-) + +--- a/drivers/dma/bcm2835-dma.c ++++ b/drivers/dma/bcm2835-dma.c +@@ -679,8 +679,6 @@ static int bcm2835_dma_slave_config(stru + } + + c->cfg = *cfg; +- if (!c->dreq) +- c->dreq = cfg->slave_id; + + return 0; + } |