Merge branch 'spi-4.19' into spi-next

diff --combined drivers/spi/spi-dw.c
index a087464efdd7592b68f27349b8ee693e247edaa9,683a4f137a256ab345476c2a2a9d88540cafc427..ac2eb89ef7a5a0616fe915ec96453ac441f589be
--- 1/drivers/spi/spi-dw.c
--- 2/drivers/spi/spi-dw.c
+++ b/drivers/spi/spi-dw.c
@@@ -133,7 -133,7 +133,7 @@@ static inline void dw_spi_debugfs_remov
  }
  #endif /* CONFIG_DEBUG_FS */
  
- static void dw_spi_set_cs(struct spi_device *spi, bool enable)
+ void dw_spi_set_cs(struct spi_device *spi, bool enable)
  {
        struct dw_spi *dws = spi_controller_get_devdata(spi->controller);
        struct chip_data *chip = spi_get_ctldata(spi);
@@@ -145,6 -145,7 +145,7 @@@
        if (!enable)
                dw_writel(dws, DW_SPI_SER, BIT(spi->chip_select));
  }
+ EXPORT_SYMBOL_GPL(dw_spi_set_cs);
  
  /* Return the max entries we can fill into tx fifo */
  static inline u32 tx_max(struct dw_spi *dws)
@@@ -485,8 -486,6 +486,8 @@@ int dw_spi_add_host(struct device *dev
        dws->dma_inited = 0;
        dws->dma_addr = (dma_addr_t)(dws->paddr + DW_SPI_DR);
  
 +      spi_controller_set_devdata(master, dws);
 +
        ret = request_irq(dws->irq, dw_spi_irq, IRQF_SHARED, dev_name(dev),
                          master);
        if (ret < 0) {
@@@ -507,6 -506,9 +508,9 @@@
        master->dev.of_node = dev->of_node;
        master->flags = SPI_MASTER_GPIO_SS;
  
+       if (dws->set_cs)
+               master->set_cs = dws->set_cs;
+ 
        /* Basic HW init */
        spi_hw_init(dev, dws);
  
@@@ -520,6 -522,7 +524,6 @@@
                }
        }
  
 -      spi_controller_set_devdata(master, dws);
        ret = devm_spi_register_controller(dev, master);
        if (ret) {
                dev_err(&master->dev, "problem registering spi master\n");