dmaengine: ctxt refresh

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

1 files changed, 12 insertions, 12 deletions

diff --git a/queue/dmaengine-idma64-Use-actual-device-for-DMA-transfers.patch b/queue/dmaengine-idma64-Use-actual-device-for-DMA-transfers.patch
index 968585b..9e38c7a 100644
--- a/queue/dmaengine-idma64-Use-actual-device-for-DMA-transfers.patch
+++ b/queue/dmaengine-idma64-Use-actual-device-for-DMA-transfers.patch
@@ -1,4 +1,4 @@
-From 5ba846b1ee0792f5a596b9b0b86d6e8cdebfab06 Mon Sep 17 00:00:00 2001
+From d411cf2cae99be16579c61cfca69029192a86aac Mon Sep 17 00:00:00 2001
 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Date: Mon, 18 Mar 2019 18:39:30 +0300
 Subject: [PATCH] dmaengine: idma64: Use actual device for DMA transfers
@@ -26,10 +26,10 @@ Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> [for tty parts]
 Signed-off-by: Vinod Koul <vkoul@kernel.org>
 
 diff --git a/drivers/dma/idma64.c b/drivers/dma/idma64.c
-index 0baf9797cc09..83796a33dc16 100644
+index e5c911200bdb..231e77535766 100644
 --- a/drivers/dma/idma64.c
 +++ b/drivers/dma/idma64.c
-@@ -592,7 +592,7 @@ static int idma64_probe(struct idma64_chip *chip)
+@@ -589,7 +589,7 @@ static int idma64_probe(struct idma64_chip *chip)
  	idma64->dma.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
  	idma64->dma.residue_granularity = DMA_RESIDUE_GRANULARITY_BURST;
  
@@ -38,7 +38,7 @@ index 0baf9797cc09..83796a33dc16 100644
  
  	dma_set_max_seg_size(idma64->dma.dev, IDMA64C_CTLH_BLOCK_TS_MASK);
  
-@@ -632,6 +632,7 @@ static int idma64_platform_probe(struct platform_device *pdev)
+@@ -629,6 +629,7 @@ static int idma64_platform_probe(struct platform_device *pdev)
  {
  	struct idma64_chip *chip;
  	struct device *dev = &pdev->dev;
@@ -46,7 +46,7 @@ index 0baf9797cc09..83796a33dc16 100644
  	struct resource *mem;
  	int ret;
  
-@@ -648,11 +649,12 @@ static int idma64_platform_probe(struct platform_device *pdev)
+@@ -645,11 +646,12 @@ static int idma64_platform_probe(struct platform_device *pdev)
  	if (IS_ERR(chip->regs))
  		return PTR_ERR(chip->regs);
  
@@ -80,10 +80,10 @@ index 6b816878e5e7..baa32e1425de 100644
  	void __iomem	*regs;
  	struct idma64	*idma64;
 diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
-index b6ddba833d02..5ea70f7d12e7 100644
+index 729be74621e3..f41333817c50 100644
 --- a/drivers/spi/spi-pxa2xx.c
 +++ b/drivers/spi/spi-pxa2xx.c
-@@ -1487,12 +1487,7 @@ static int pxa2xx_spi_get_port_id(struct acpi_device *adev)
+@@ -1416,12 +1416,7 @@ static const struct pci_device_id pxa2xx_spi_pci_compound_match[] = {
  
  static bool pxa2xx_spi_idma_filter(struct dma_chan *chan, void *param)
  {
@@ -96,12 +96,12 @@ index b6ddba833d02..5ea70f7d12e7 100644
 +	return param == chan->device->dev;
  }
  
- #endif /* CONFIG_PCI */
+ static struct pxa2xx_spi_master *
 diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c
-index d31b975dd3fd..284e8d052fc3 100644
+index a25f6ea5c784..cc6877fea7eb 100644
 --- a/drivers/tty/serial/8250/8250_dw.c
 +++ b/drivers/tty/serial/8250/8250_dw.c
-@@ -365,7 +365,7 @@ static bool dw8250_fallback_dma_filter(struct dma_chan *chan, void *param)
+@@ -348,7 +348,7 @@ static bool dw8250_fallback_dma_filter(struct dma_chan *chan, void *param)
  
  static bool dw8250_idma_filter(struct dma_chan *chan, void *param)
  {
@@ -109,8 +109,8 @@ index d31b975dd3fd..284e8d052fc3 100644
 +	return param == chan->device->dev;
  }
  
- /*
-@@ -434,7 +434,7 @@ static void dw8250_quirks(struct uart_port *p, struct dw8250_data *data)
+ static void dw8250_quirks(struct uart_port *p, struct dw8250_data *data)
+@@ -386,7 +386,7 @@ static void dw8250_quirks(struct uart_port *p, struct dw8250_data *data)
  		data->uart_16550_compatible = true;
  	}