From: Mark Brown <broonie@kernel.org>
Date: Mon, 26 Oct 2020 20:28:19 +0000 (+0000)
Subject: Merge existing fixes from spi/for-5.10
X-Git-Tag: v5.15~2029^2~70
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2ee1b42e8a0d698daf5553257e51432f84c230f7;p=platform%2Fkernel%2Flinux-starfive.git

Merge existing fixes from spi/for-5.10
---

2ee1b42e8a0d698daf5553257e51432f84c230f7
diff --cc drivers/spi/spi-imx.c
index 060b1f5,95be1b2..4b80e27
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@@ -1717,13 -1720,14 +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);