Unverified Commit 4221a2be authored by Mark Brown's avatar Mark Brown
Browse files

spi: Merge up old fix 

This fix was originally queued at the end of the 6.4 cycle but as it was
minor it never actually got sent.
parents 5f66db08 1527b076

drivers/spi/spi-zynqmp-gqspi.c

+8 −4
Original line number Diff line number Diff line
@@ -1340,9 +1340,9 @@ static int zynqmp_qspi_probe(struct platform_device *pdev) 
	return 0;



clk_dis_all:

	pm_runtime_put_sync(&pdev->dev);

	pm_runtime_set_suspended(&pdev->dev);

	pm_runtime_disable(&pdev->dev);

	pm_runtime_put_noidle(&pdev->dev);

	pm_runtime_set_suspended(&pdev->dev);

	clk_disable_unprepare(xqspi->refclk);

clk_dis_pclk:

	clk_disable_unprepare(xqspi->pclk);
@@ -1366,11 +1366,15 @@ static void zynqmp_qspi_remove(struct platform_device *pdev) 
{

	struct zynqmp_qspi *xqspi = platform_get_drvdata(pdev);



	pm_runtime_get_sync(&pdev->dev);



	zynqmp_gqspi_write(xqspi, GQSPI_EN_OFST, 0x0);



	pm_runtime_disable(&pdev->dev);

	pm_runtime_put_noidle(&pdev->dev);

	pm_runtime_set_suspended(&pdev->dev);

	clk_disable_unprepare(xqspi->refclk);

	clk_disable_unprepare(xqspi->pclk);

	pm_runtime_set_suspended(&pdev->dev);

	pm_runtime_disable(&pdev->dev);

}



MODULE_DEVICE_TABLE(of, zynqmp_qspi_of_match);