Merge remote-tracking branches 'spi/topic/jcore', 'spi/topic/kconfig', 'spi/topic...

diff --combined drivers/spi/spi-pxa2xx.c
index 56254b3,b0822d1,b0822d1,b0822d1,713506e,b0822d1..82dcb88
--- 1/drivers/spi/spi-pxa2xx.c
--- 2/drivers/spi/spi-pxa2xx.c
--- 3/drivers/spi/spi-pxa2xx.c
--- 4/drivers/spi/spi-pxa2xx.c
--- 5/drivers/spi/spi-pxa2xx.c
--- 6/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@@@@@@ -415,10 -415,10 -415,10 -415,10 -415,17 -415,10 +415,17 @@@@@@@ static void cs_deassert(struct driver_d
      {
        struct chip_data *chip =
                spi_get_ctldata(drv_data->master->cur_msg->spi);
++++ +  unsigned long timeout;
      
        if (drv_data->ssp_type == CE4100_SSP)
                return;
      
++++ +  /* Wait until SSP becomes idle before deasserting the CS */
++++ +  timeout = jiffies + msecs_to_jiffies(10);
++++ +  while (pxa2xx_spi_read(drv_data, SSSR) & SSSR_BSY &&
++++ +         !time_after(jiffies, timeout))
++++ +          cpu_relax();
++++ +
        if (chip->cs_control) {
                chip->cs_control(PXA2XX_CS_DEASSERT);
                return;
@@@@@@@ -563,7 -563,7 -563,7 -563,7 -570,6 -563,7 +570,6 @@@@@@@ static void giveback(struct driver_dat
      {
        struct spi_transfer* last_transfer;
        struct spi_message *msg;
---- -  unsigned long timeout;
      
        msg = drv_data->master->cur_msg;
        drv_data->cur_transfer = NULL;
@@@@@@@ -575,12 -575,12 -575,12 -575,12 -581,6 -575,12 +581,6 @@@@@@@
        if (last_transfer->delay_usecs)
                udelay(last_transfer->delay_usecs);
      
---- -  /* Wait until SSP becomes idle before deasserting the CS */
---- -  timeout = jiffies + msecs_to_jiffies(10);
---- -  while (pxa2xx_spi_read(drv_data, SSSR) & SSSR_BSY &&
---- -         !time_after(jiffies, timeout))
---- -          cpu_relax();
---- -
        /* Drop chip select UNLESS cs_change is true or we are returning
         * a message with an error, or next message is for another chip
         */
@@@@@@@ -962,7 -962,7 -962,7 -962,7 -962,7 -962,7 +962,7 @@@@@@@ static unsigned int pxa2xx_ssp_get_clk_
        return clk_div << 8;
      }
      
---- -static bool pxa2xx_spi_can_dma(struct spi_master *master,
++++ +static bool pxa2xx_spi_can_dma(struct spi_controller *master,
                               struct spi_device *spi,
                               struct spi_transfer *xfer)
      {
@@@@@@@ -976,7 -976,7 -976,7 -976,7 -976,7 -976,7 +976,7 @@@@@@@
      static void pump_transfers(unsigned long data)
      {
        struct driver_data *drv_data = (struct driver_data *)data;
---- -  struct spi_master *master = drv_data->master;
++++ +  struct spi_controller *master = drv_data->master;
        struct spi_message *message = master->cur_msg;
        struct chip_data *chip = spi_get_ctldata(message->spi);
        u32 dma_thresh = chip->dma_threshold;
@@@@@@@ -1182,10 -1182,10 -1182,10 -1182,10 -1182,10 -1182,10 +1182,10 @@@@@@@
        pxa2xx_spi_write(drv_data, SSCR1, cr1);
      }
      
---- -static int pxa2xx_spi_transfer_one_message(struct spi_master *master,
++++ +static int pxa2xx_spi_transfer_one_message(struct spi_controller *master,
                                           struct spi_message *msg)
      {
---- -  struct driver_data *drv_data = spi_master_get_devdata(master);
++++ +  struct driver_data *drv_data = spi_controller_get_devdata(master);
      
        /* Initial message state*/
        msg->state = START_STATE;
@@@@@@@ -1198,9 -1198,9 -1198,9 -1198,9 -1198,9 -1198,9 +1198,9 @@@@@@@
        return 0;
      }
      
---- -static int pxa2xx_spi_unprepare_transfer(struct spi_master *master)
++++ +static int pxa2xx_spi_unprepare_transfer(struct spi_controller *master)
      {
---- -  struct driver_data *drv_data = spi_master_get_devdata(master);
++++ +  struct driver_data *drv_data = spi_controller_get_devdata(master);
      
        /* Disable the SSP now */
        pxa2xx_spi_write(drv_data, SSCR0,
@@@@@@@ -1212,7 -1212,7 -1212,7 -1212,7 -1212,8 -1212,7 +1212,8 @@@@@@@
      static int setup_cs(struct spi_device *spi, struct chip_data *chip,
                    struct pxa2xx_spi_chip *chip_info)
      {
---- -  struct driver_data *drv_data = spi_master_get_devdata(spi->master);
++++ +  struct driver_data *drv_data =
++++ +          spi_controller_get_devdata(spi->controller);
        struct gpio_desc *gpiod;
        int err = 0;
      
@@@@@@@ -1270,7 -1270,7 -1270,7 -1270,7 -1271,8 -1270,7 +1271,8 @@@@@@@ static int setup(struct spi_device *spi
        struct pxa2xx_spi_chip *chip_info;
        struct chip_data *chip;
        const struct lpss_config *config;
---- -  struct driver_data *drv_data = spi_master_get_devdata(spi->master);
++++ +  struct driver_data *drv_data =
++++ +          spi_controller_get_devdata(spi->controller);
        uint tx_thres, tx_hi_thres, rx_thres;
      
        switch (drv_data->ssp_type) {
@@@@@@@ -1410,7 -1410,7 -1410,7 -1410,7 -1412,8 -1410,7 +1412,8 @@@@@@@
      static void cleanup(struct spi_device *spi)
      {
        struct chip_data *chip = spi_get_ctldata(spi);
---- -  struct driver_data *drv_data = spi_master_get_devdata(spi->master);
++++ +  struct driver_data *drv_data =
++++ +          spi_controller_get_devdata(spi->controller);
      
        if (!chip)
                return;
@@@@@@@ -1575,9 -1575,9 -1575,9 -1575,9 -1578,10 -1575,9 +1578,10 @@@@@@@ pxa2xx_spi_init_pdata(struct platform_d
      }
      #endif
      
---- -static int pxa2xx_spi_fw_translate_cs(struct spi_master *master, unsigned cs)
++++ +static int pxa2xx_spi_fw_translate_cs(struct spi_controller *master,
++++ +                                unsigned int cs)
      {
---- -  struct driver_data *drv_data = spi_master_get_devdata(master);
++++ +  struct driver_data *drv_data = spi_controller_get_devdata(master);
      
        if (has_acpi_companion(&drv_data->pdev->dev)) {
                switch (drv_data->ssp_type) {
@@@@@@@ -1602,7 -1602,7 -1602,7 -1602,7 -1606,7 -1602,7 +1606,7 @@@@@@@ static int pxa2xx_spi_probe(struct plat
      {
        struct device *dev = &pdev->dev;
        struct pxa2xx_spi_master *platform_info;
---- -  struct spi_master *master;
++++ +  struct spi_controller *master;
        struct driver_data *drv_data;
        struct ssp_device *ssp;
        const struct lpss_config *config;
@@@@@@@ -1633,7 -1633,7 -1633,7 -1633,7 -1637,7 -1633,7 +1637,7 @@@@@@@
                pxa_ssp_free(ssp);
                return -ENOMEM;
        }
---- -  drv_data = spi_master_get_devdata(master);
++++ +  drv_data = spi_controller_get_devdata(master);
        drv_data->master = master;
        drv_data->master_info = platform_info;
        drv_data->pdev = pdev;
@@@@@@@ -1651,7 -1651,7 -1651,7 -1651,7 -1655,7 -1651,7 +1655,7 @@@@@@@
        master->unprepare_transfer_hardware = pxa2xx_spi_unprepare_transfer;
        master->fw_translate_cs = pxa2xx_spi_fw_translate_cs;
        master->auto_runtime_pm = true;
---- -  master->flags = SPI_MASTER_MUST_RX | SPI_MASTER_MUST_TX;
++++ +  master->flags = SPI_CONTROLLER_MUST_RX | SPI_CONTROLLER_MUST_TX;
      
        drv_data->ssp_type = ssp->type;
      
@@@@@@@ -1793,7 -1793,7 -1793,7 -1793,7 -1797,7 -1793,7 +1797,7 @@@@@@@
      
        /* Register with the SPI framework */
        platform_set_drvdata(pdev, drv_data);
---- -  status = devm_spi_register_master(&pdev->dev, master);
++++ +  status = devm_spi_register_controller(&pdev->dev, master);
        if (status != 0) {
                dev_err(&pdev->dev, "problem registering spi master\n");
                goto out_error_clock_enabled;
@@@@@@@ -1802,14 -1802,12 -1802,12 -1802,12 -1806,12 -1802,12 +1806,14 @@@@@@@
        return status;
      
      out_error_clock_enabled:
 +++++  pm_runtime_put_noidle(&pdev->dev);
 +++++  pm_runtime_disable(&pdev->dev);
        clk_disable_unprepare(ssp->clk);
        pxa2xx_spi_dma_release(drv_data);
        free_irq(ssp->irq, drv_data);
      
      out_error_master_alloc:
---- -  spi_master_put(master);
++++ +  spi_controller_put(master);
        pxa_ssp_free(ssp);
        return status;
      }
@@@@@@@ -1860,7 -1858,7 -1858,7 -1858,7 -1862,7 -1858,7 +1864,7 @@@@@@@ static int pxa2xx_spi_suspend(struct de
        struct ssp_device *ssp = drv_data->ssp;
        int status;
      
---- -  status = spi_master_suspend(drv_data->master);
++++ +  status = spi_controller_suspend(drv_data->master);
        if (status != 0)
                return status;
        pxa2xx_spi_write(drv_data, SSCR0, 0);
@@@@@@@ -1886,7 -1884,7 -1884,7 -1884,7 -1888,7 -1884,7 +1890,7 @@@@@@@ static int pxa2xx_spi_resume(struct dev
                lpss_ssp_setup(drv_data);
      
        /* Start the queue running */
---- -  status = spi_master_resume(drv_data->master);
++++ +  status = spi_controller_resume(drv_data->master);
        if (status != 0) {
                dev_err(dev, "problem starting queue (%d)\n", status);
                return status;