Merge existing fixes from spi/for-5.10

diff --combined drivers/spi/spi-imx.c
index 060b1f5c9b048bbc85139d64b88586dd2bd88bec,95be1b20af32ede960849bbe8539646838b9f7e6..4b80e27ecdbf9aed3cf4bdecab7e7c0e7f74974e
--- 1/drivers/spi/spi-imx.c
--- 2/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@@ -1676,15 -1676,18 +1676,18 @@@ static int spi_imx_probe(struct platfor
                goto out_master_put;
        }
  
-       pm_runtime_enable(spi_imx->dev);
+       ret = clk_prepare_enable(spi_imx->clk_per);
+       if (ret)
+               goto out_master_put;
+ 
+       ret = clk_prepare_enable(spi_imx->clk_ipg);
+       if (ret)
+               goto out_put_per;
+ 
        pm_runtime_set_autosuspend_delay(spi_imx->dev, MXC_RPM_TIMEOUT);
        pm_runtime_use_autosuspend(spi_imx->dev);
- 
-       ret = pm_runtime_get_sync(spi_imx->dev);
-       if (ret < 0) {
-               dev_err(spi_imx->dev, "failed to enable clock\n");
-               goto out_runtime_pm_put;
-       }
+       pm_runtime_set_active(spi_imx->dev);
+       pm_runtime_enable(spi_imx->dev);
  
        spi_imx->spi_clk = clk_get_rate(spi_imx->clk_per);
        /*
@@@ -1709,7 -1712,7 +1712,7 @@@
        ret = spi_bitbang_start(&spi_imx->bitbang);
        if (ret) {
                dev_err(&pdev->dev, "bitbang start failed with %d\n", ret);
 -              goto out_runtime_pm_put;
 +              goto out_bitbang_start;
        }
  
        pm_runtime_mark_last_busy(spi_imx->dev);
@@@ -1717,13 -1720,14 +1720,17 @@@
  
        return ret;
  
 +out_bitbang_start:
 +      if (spi_imx->devtype_data->has_dmamode)
 +              spi_imx_sdma_exit(spi_imx);
  out_runtime_pm_put:
        pm_runtime_dont_use_autosuspend(spi_imx->dev);
-       pm_runtime_put_sync(spi_imx->dev);
+       pm_runtime_set_suspended(&pdev->dev);
        pm_runtime_disable(spi_imx->dev);
+ 
+       clk_disable_unprepare(spi_imx->clk_ipg);
+ out_put_per:
+       clk_disable_unprepare(spi_imx->clk_per);
  out_master_put:
        spi_master_put(master);