Merge branch 'spi-5.5' into spi-next

diff --cc drivers/spi/spi-atmel.c
index 2f8c79ce05c8969c4e5cb8f142b7c413597dab4d,d692cc388126034d1c0ef21a146bac3119a351e8..56f0ca361deba481ff7807a6edf91eef58cc98e5
--- 1/drivers/spi/spi-atmel.c
--- 2/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-dw-mmio.c
Simple merge

diff --cc drivers/spi/spi-dw.c
Simple merge

diff --cc drivers/spi/spi-pxa2xx.c
index 1e0091259259098a62c36554c213e59401f05505,9bc710c1b9e519baf4f622eb30ca02a57a2732e9..16b6b2ad4e7c0aec2c3d58f6aa9ddac6f6d9dd32
--- 1/drivers/spi/spi-pxa2xx.c
--- 2/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

diff --cc drivers/spi/spi.c
Simple merge