Merge tag 'v5.10-rc1' into spi-5.10

Linux 5.10-rc1

diff --cc drivers/spi/spi-imx.c
index 95be1b20af32ede960849bbe8539646838b9f7e6,060b1f5c9b048bbc85139d64b88586dd2bd88bec..4b80e27ecdbf9aed3cf4bdecab7e7c0e7f74974e
--- 1/drivers/spi/spi-imx.c
--- 2/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@@ -1720,14 -1717,13 +1720,17 @@@ static int spi_imx_probe(struct platfor
  
        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);