ARM: pxa: add the number of DMA requestor lines

Declare the number of DMA requestor lines per platform :
 - for pxa25x: 40 requestor lines
 - for pxa27x: 75 requestor lines
 - for pxa3xx: 100 requestor lines

This information will be used to activate the DMA flow control or not.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>

4 files changed, 5 insertions, 4 deletions

diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c
index 37d8d85662f0..913a319c7b00 100644
--- a/arch/arm/mach-pxa/devices.c
+++ b/arch/arm/mach-pxa/devices.c
@@ -1203,6 +1203,7 @@ void __init pxa2xx_set_spi_info(unsigned id, struct pxa2xx_spi_master *info)
 
 static struct mmp_dma_platdata pxa_dma_pdata = {
         .dma_channels   = 0,
+        .nb_requestors  = 0,
 };
 
 static struct resource pxa_dma_resource[] = {
@@ -1231,7 +1232,7 @@ static struct platform_device pxa2xx_pxa_dma = {
         .resource       = pxa_dma_resource,
 };
 
-void __init pxa2xx_set_dmac_info(int nb_channels)
+void __init pxa2xx_set_dmac_info(int nb_channels, int nb_requestors)
 {
         pxa_dma_pdata.dma_channels = nb_channels;
         pxa_register_device(&pxa2xx_pxa_dma, &pxa_dma_pdata);
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
index a177bf45feef..823504f48f80 100644
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
@@ -206,7 +206,7 @@ static int __init pxa25x_init(void)
                 register_syscore_ops(&pxa_irq_syscore_ops);
                 register_syscore_ops(&pxa2xx_mfp_syscore_ops);
 
-                pxa2xx_set_dmac_info(16);
+                pxa2xx_set_dmac_info(16, 40);
                 pxa_register_device(&pxa25x_device_gpio, &pxa25x_gpio_info);
                 ret = platform_add_devices(pxa25x_devices,
                                            ARRAY_SIZE(pxa25x_devices));
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
index 49c735962148..2eaa341dd3f8 100644
--- a/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@ -311,7 +311,7 @@ static int __init pxa27x_init(void)
                 if (!of_have_populated_dt()) {
                         pxa_register_device(&pxa27x_device_gpio,
                                             &pxa27x_gpio_info);
-                        pxa2xx_set_dmac_info(32);
+                        pxa2xx_set_dmac_info(32, 75);
                         ret = platform_add_devices(devices,
                                                    ARRAY_SIZE(devices));
                 }
diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c
index 126c265691f5..3c9184d1d6b9 100644
--- a/arch/arm/mach-pxa/pxa3xx.c
+++ b/arch/arm/mach-pxa/pxa3xx.c
@@ -449,7 +449,7 @@ static int __init pxa3xx_init(void)
                 if (of_have_populated_dt())
                         return 0;
 
-                pxa2xx_set_dmac_info(32);
+                pxa2xx_set_dmac_info(32, 100);
                 ret = platform_add_devices(devices, ARRAY_SIZE(devices));
                 if (ret)
                         return ret;