Unverified Commit 2ee1b42e authored by Mark Brown's avatar Mark Brown
Browse files

Merge existing fixes from spi/for-5.10

parents 3650b228 43b6bf40

drivers/spi/spi-imx.c

+15 −8
Original line number Diff line number Diff line
@@ -1676,15 +1676,18 @@ static int spi_imx_probe(struct platform_device *pdev) 
		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);

	/*
@@ -1722,8 +1725,12 @@ static int spi_imx_probe(struct platform_device *pdev) 
		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);