summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2016-04-12 12:33:41 -0700
committerOlof Johansson <olof@lixom.net>2016-04-12 12:33:41 -0700
commit13ab2c80e2aae436fa7f0b8a1b0133e9c143f42b (patch)
tree62d4315feb536071e3f3b65fc3778fb86b381b25 /arch
parent2e1d18c6997da888217f66b0bdc210de9742b936 (diff)
parent4c35430ad18f5a034302cb90e559ede5a27f93b9 (diff)
downloadlinux-sh-13ab2c80e2aae436fa7f0b8a1b0133e9c143f42b.tar.gz
Merge tag 'pxa-fixes-v4.6' of https://github.com/rjarzmik/linux into fixes
ARM: pxa: fixes for v4.6 There is only a single fix for dma requestor lines initial setup, triggered by dmaengine previous fix. * tag 'pxa-fixes-v4.6' of https://github.com/rjarzmik/linux: ARM: pxa: fix the number of DMA requestor lines Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-pxa/devices.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c
index 913a319c7b00..fffb697bbf0e 100644
--- a/arch/arm/mach-pxa/devices.c
+++ b/arch/arm/mach-pxa/devices.c
@@ -1235,5 +1235,6 @@ static struct platform_device pxa2xx_pxa_dma = {
void __init pxa2xx_set_dmac_info(int nb_channels, int nb_requestors)
{
pxa_dma_pdata.dma_channels = nb_channels;
+ pxa_dma_pdata.nb_requestors = nb_requestors;
pxa_register_device(&pxa2xx_pxa_dma, &pxa_dma_pdata);
}