Merge remote-tracking branch 'spi/topic/loop' into spi-next

diff --cc drivers/spi/Kconfig
Simple merge

diff --cc drivers/spi/spi-s3c64xx.c
index ae07c3afe956bc24c41fec63ad6f67759d10ea1e,25eb352d6a4278a295a3e14e834de430c2717b04..508f51fc570460d36bffee9f2e9bc30c35a9e970
--- 1/drivers/spi/spi-s3c64xx.c
--- 2/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@@ -1121,8 -1099,8 +1099,9 @@@ static int s3c64xx_spi_setup(struct spi
        return 0;
  
  setup_exit:
 +      pm_runtime_put(&sdd->pdev->dev);
        /* setup() returns with device de-selected */
+       writel(S3C64XX_SPI_SLAVE_SIG_INACT, sdd->regs + S3C64XX_SPI_SLAVE_SEL);
        disable_cs(sdd, spi);
  
        gpio_free(cs->line);
@@@ -1429,12 -1409,11 +1410,12 @@@ static int s3c64xx_spi_probe(struct pla
               S3C64XX_SPI_INT_TX_OVERRUN_EN | S3C64XX_SPI_INT_TX_UNDERRUN_EN,
               sdd->regs + S3C64XX_SPI_INT_EN);
  
 +      pm_runtime_set_active(&pdev->dev);
        pm_runtime_enable(&pdev->dev);
  
-       if (spi_register_master(master)) {
-               dev_err(&pdev->dev, "cannot register SPI master\n");
-               ret = -EBUSY;
+       ret = devm_spi_register_master(&pdev->dev, master);
+       if (ret != 0) {
+               dev_err(&pdev->dev, "cannot register SPI master: %d\n", ret);
                goto err3;
        }
  

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