From: Greg Kroah-Hartman Date: Tue, 3 May 2016 00:59:20 +0000 (-0700) Subject: 4.5-stable patches X-Git-Tag: v3.14.68~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8acf9d4a7310a3ea45e2aacc27c097c36c2dd9db;p=thirdparty%2Fkernel%2Fstable-queue.git 4.5-stable patches added patches: dmaengine-mmp-pdma-add-number-of-requestors.patch --- diff --git a/queue-4.5/dmaengine-mmp-pdma-add-number-of-requestors.patch b/queue-4.5/dmaengine-mmp-pdma-add-number-of-requestors.patch new file mode 100644 index 00000000000..05ced3437b9 --- /dev/null +++ b/queue-4.5/dmaengine-mmp-pdma-add-number-of-requestors.patch @@ -0,0 +1,32 @@ +From c283e41ef32442f41e7180f9bb1c5aedf9255bfe Mon Sep 17 00:00:00 2001 +From: Robert Jarzmik +Date: Mon, 15 Feb 2016 21:57:46 +0100 +Subject: dmaengine: mmp-pdma: add number of requestors + +From: Robert Jarzmik + +commit c283e41ef32442f41e7180f9bb1c5aedf9255bfe upstream. + +The DMA chip has a fixed number of requestor lines used for flow +control. This number is platform dependent. The pxa_dma dma driver will +use this value to activate or not the flow control. + +There won't be any impact on mmp_pdma driver. + +Signed-off-by: Robert Jarzmik +Signed-off-by: Greg Kroah-Hartman + +--- + include/linux/platform_data/mmp_dma.h | 1 + + 1 file changed, 1 insertion(+) + +--- a/include/linux/platform_data/mmp_dma.h ++++ b/include/linux/platform_data/mmp_dma.h +@@ -14,6 +14,7 @@ + + struct mmp_dma_platdata { + int dma_channels; ++ int nb_requestors; + }; + + #endif /* MMP_DMA_H */ diff --git a/queue-4.5/series b/queue-4.5/series index a30a2fba750..ae066950507 100644 --- a/queue-4.5/series +++ b/queue-4.5/series @@ -198,3 +198,4 @@ tpm-fix-checks-for-policy-digest-existence-in-tpm2_seal_trusted.patch tpm-fix-set-continuesession-attribute-for-the-unseal-operation.patch stm-class-select-config_srcu.patch extcon-max77843-use-correct-size-for-reading-the-interrupt-register.patch +dmaengine-mmp-pdma-add-number-of-requestors.patch