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

spi: microchip-core-qspi: fix controller deregistration 



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

Fixes: 8596124c ("spi: microchip-core-qspi: Add support for microchip fpga qspi controllers")
Cc: stable@vger.kernel.org	# 6.1
Cc: Naga Sureshkumar Relli <nagasuresh.relli@microchip.com>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Acked-by: default avatarConor Dooley <conor.dooley@microchip.com>
Link: https://patch.msgid.link/20260409120419.388546-19-johan@kernel.org


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

drivers/spi/spi-microchip-core-qspi.c

+8 −4
Original line number Diff line number Diff line
@@ -692,7 +692,7 @@ static int mchp_coreqspi_probe(struct platform_device *pdev) 
		return -ENOMEM;



	qspi = spi_controller_get_devdata(ctlr);

	platform_set_drvdata(pdev, qspi);

	platform_set_drvdata(pdev, ctlr);



	qspi->regs = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(qspi->regs))
@@ -732,7 +732,7 @@ static int mchp_coreqspi_probe(struct platform_device *pdev) 
	ctlr->num_chipselect = 2;

	ctlr->use_gpio_descriptors = true;



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

	ret = spi_register_controller(ctlr);

	if (ret)

		return dev_err_probe(&pdev->dev, ret,

				     "spi_register_controller failed\n");
@@ -742,9 +742,13 @@ static int mchp_coreqspi_probe(struct platform_device *pdev) 


static void mchp_coreqspi_remove(struct platform_device *pdev)

{

	struct mchp_coreqspi *qspi = platform_get_drvdata(pdev);

	u32 control = readl_relaxed(qspi->regs + REG_CONTROL);

	struct spi_controller *ctlr = platform_get_drvdata(pdev);

	struct mchp_coreqspi *qspi = spi_controller_get_devdata(ctlr);

	u32 control;



	spi_unregister_controller(ctlr);



	control = readl_relaxed(qspi->regs + REG_CONTROL);

	mchp_coreqspi_disable_ints(qspi);

	control &= ~CONTROL_ENABLE;

	writel_relaxed(control, qspi->regs + REG_CONTROL);