Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

[linux.git] / drivers / spi / spi-pxa2xx-pci.c

diff --git a/drivers/spi/spi-pxa2xx-pci.c b/drivers/spi/spi-pxa2xx-pci.c
index 1727fdfbac28f1070aaef5143781d44f9e06d368..f236e3034cf85f418bafed48e1702b4c5d1606d4 100644 (file)
--- a/drivers/spi/spi-pxa2xx-pci.c
+++ b/drivers/spi/spi-pxa2xx-pci.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * CE4100's SPI device is more or less the same one as found on PXA
  *
@@ -5,7 +6,6 @@
  */
 #include <linux/clk-provider.h>
 #include <linux/module.h>
-#include <linux/of_device.h>
 #include <linux/pci.h>
 #include <linux/platform_device.h>
 #include <linux/spi/pxa2xx_spi.h>
@@ -35,6 +35,8 @@ struct pxa_spi_info {
        void *tx_param;
        void *rx_param;
 
+       int dma_burst_size;
+
        int (*setup)(struct pci_dev *pdev, struct pxa_spi_info *c);
 };
 
@@ -133,6 +135,7 @@ static int mrfld_spi_setup(struct pci_dev *dev, struct pxa_spi_info *c)
        rx->dma_dev = &dma_dev->dev;
 
        c->dma_filter = lpss_dma_filter;
+       c->dma_burst_size = 8;
        return 0;
 }
 
@@ -223,6 +226,7 @@ static int pxa2xx_spi_pci_probe(struct pci_dev *dev,
        spi_pdata.tx_param = c->tx_param;
        spi_pdata.rx_param = c->rx_param;
        spi_pdata.enable_dma = c->rx_param && c->tx_param;
+       spi_pdata.dma_burst_size = c->dma_burst_size ? c->dma_burst_size : 1;
 
        ssp = &spi_pdata.ssp;
        ssp->phys_base = pci_resource_start(dev, 0);