From: Mark Brown <broonie@kernel.org>
Date: Fri, 22 Nov 2019 19:56:35 +0000 (+0000)
Subject: Merge branch 'spi-5.5' into spi-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ca4196aa10087fe3ba3ce2383761898dc95b5e94;p=linux.git

Merge branch 'spi-5.5' into spi-next
---

ca4196aa10087fe3ba3ce2383761898dc95b5e94
diff --cc drivers/spi/spi-atmel.c
index 2f8c79ce05c89,d692cc3881260..56f0ca361deba
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@@ -299,11 -275,13 +275,12 @@@ struct atmel_spi 
  
  	bool			use_dma;
  	bool			use_pdc;
- 	bool			use_cs_gpios;
  
  	bool			keep_cs;
 -	bool			cs_active;
  
  	u32			fifo_size;
+ 	u8			native_cs_free;
+ 	u8			native_cs_for_gpio;
  };
  
  /* Controller-specific per-slave state */
diff --cc drivers/spi/spi-pxa2xx.c
index 1e00912592590,9bc710c1b9e51..16b6b2ad4e7c0
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@@ -1556,12 -1548,10 +1548,12 @@@ pxa2xx_spi_init_pdata(struct platform_d
  	if (IS_ERR(ssp->mmio_base))
  		return NULL;
  
 +	ssp->phys_base = res->start;
 +
  #ifdef CONFIG_PCI
  	if (pcidev_id) {
- 		pdata->tx_param = pdev->dev.parent;
- 		pdata->rx_param = pdev->dev.parent;
+ 		pdata->tx_param = parent;
+ 		pdata->rx_param = parent;
  		pdata->dma_filter = pxa2xx_spi_idma_filter;
  	}
  #endif