Unverified Commit 6895fc4f authored by Johan Hovold's avatar Johan Hovold Committed by Mark Brown
Browse files

spi: zynqmp-gqspi: fix controller deregistration 



Make sure to deregister the controller before disabling underlying
resources like clocks during driver unbind.

Fixes: dfe11a11 ("spi: Add support for Zynq Ultrascale+ MPSoC GQSPI controller")
Cc: stable@vger.kernel.org	# 4.2: 64640f6c
Cc: stable@vger.kernel.org	# 4.2
Cc: Ranjit Waghmode <ranjit.waghmode@xilinx.com>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260410081757.503099-26-johan@kernel.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0245435f

drivers/spi/spi-zynqmp-gqspi.c

+3 −1
Original line number Diff line number Diff line
@@ -1324,7 +1324,7 @@ static int zynqmp_qspi_probe(struct platform_device *pdev) 
	ctlr->dev.of_node = np;

	ctlr->auto_runtime_pm = true;



	ret = devm_spi_register_controller(&pdev->dev, ctlr);

	ret = spi_register_controller(ctlr);

	if (ret) {

		dev_err(&pdev->dev, "spi_register_controller failed\n");

		goto clk_dis_all;
@@ -1362,6 +1362,8 @@ static void zynqmp_qspi_remove(struct platform_device *pdev) 


	pm_runtime_get_sync(&pdev->dev);



	spi_unregister_controller(xqspi->ctlr);



	zynqmp_gqspi_write(xqspi, GQSPI_EN_OFST, 0x0);



	pm_runtime_disable(&pdev->dev);