[PATCH] spi: cadence-xspi: support suspend/resume

[PATCH] spi: cadence-xspi: support suspend/resume

[Jisheng Zhang]

Add system wide suspend and resume support, the suspend hook
implementation is straightforward, just call spi_controller_suspend()
While the resume hook implementation is a bit complex, we need to redo
something which is done during probe, such as enable the interrupts,
setup clk and config the phy for mrvl hw overlay.

Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
---
 drivers/spi/spi-cadence-xspi.c | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/drivers/spi/spi-cadence-xspi.c b/drivers/spi/spi-cadence-xspi.c
index 72384d90d113..895b4b3276a5 100644
--- a/drivers/spi/spi-cadence-xspi.c
+++ b/drivers/spi/spi-cadence-xspi.c
@@ -350,6 +350,7 @@ static const int cdns_mrvl_xspi_clk_div_list[] = {
 
 struct cdns_xspi_dev {
 	struct platform_device *pdev;
+	struct spi_controller *host;
 	struct device *dev;
 
 	void __iomem *iobase;
@@ -1159,9 +1160,10 @@ static int cdns_xspi_probe(struct platform_device *pdev)
 	}
 	host->bus_num = -1;
 
-	platform_set_drvdata(pdev, host);
+	platform_set_drvdata(pdev, cdns_xspi);
 
 	cdns_xspi->pdev = pdev;
+	cdns_xspi->host = host;
 	cdns_xspi->dev = &pdev->dev;
 	cdns_xspi->cur_cs = 0;
 
@@ -1250,6 +1252,30 @@ static int cdns_xspi_probe(struct platform_device *pdev)
 	return 0;
 }
 
+static int cdns_xspi_suspend(struct device *dev)
+{
+	struct cdns_xspi_dev *cdns_xspi = dev_get_drvdata(dev);
+
+	return spi_controller_suspend(cdns_xspi->host);
+}
+
+static int cdns_xspi_resume(struct device *dev)
+{
+	struct cdns_xspi_dev *cdns_xspi = dev_get_drvdata(dev);
+
+	if (cdns_xspi->driver_data->mrvl_hw_overlay) {
+		cdns_mrvl_xspi_setup_clock(cdns_xspi, MRVL_DEFAULT_CLK);
+		cdns_xspi_configure_phy(cdns_xspi);
+	}
+
+	cdns_xspi->set_interrupts_handler(cdns_xspi, false);
+
+	return spi_controller_resume(cdns_xspi->host);
+}
+
+static DEFINE_SIMPLE_DEV_PM_OPS(cdns_xspi_pm_ops,
+				cdns_xspi_suspend, cdns_xspi_resume);
+
 static const struct of_device_id cdns_xspi_of_match[] = {
 	{
 		.compatible = "cdns,xspi-nor",
@@ -1268,6 +1294,7 @@ static struct platform_driver cdns_xspi_platform_driver = {
 	.driver = {
 		.name = CDNS_XSPI_NAME,
 		.of_match_table = cdns_xspi_of_match,
+		.pm = pm_sleep_ptr(&cdns_xspi_pm_ops),
 	},
 };
 
-- 
2.51.0

Re: [PATCH] spi: cadence-xspi: support suspend/resume

[Mark Brown]

On Thu, 22 Jan 2026 23:51:19 +0800, Jisheng Zhang wrote:
> Add system wide suspend and resume support, the suspend hook
> implementation is straightforward, just call spi_controller_suspend()
> While the resume hook implementation is a bit complex, we need to redo
> something which is done during probe, such as enable the interrupts,
> setup clk and config the phy for mrvl hw overlay.
> 
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next

Thanks!

[1/1] spi: cadence-xspi: support suspend/resume
      commit: db6a59cfcc9364dec501993690a320d916ae3904

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark