From: Mark Brown <broonie@kernel.org>
Date: Thu, 9 Jan 2025 11:22:28 +0000 (+0000)
Subject: spi: Merge up v6.13-rc6
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5640fd07b90ed43225704fecfbbda9d402dba1cf;p=users%2Fjedix%2Flinux-maple.git

spi: Merge up v6.13-rc6

This fixes the i.MX6 and newer Meson platforms in my CI.
---

5640fd07b90ed43225704fecfbbda9d402dba1cf
diff --cc drivers/spi/spi-rockchip-sfc.c
index 956363859b91,70bbb459caa4..59de351499a0
--- a/drivers/spi/spi-rockchip-sfc.c
+++ b/drivers/spi/spi-rockchip-sfc.c
@@@ -727,11 -653,10 +729,11 @@@ err_hclk
  
  static void rockchip_sfc_remove(struct platform_device *pdev)
  {
- 	struct spi_controller *host = platform_get_drvdata(pdev);
  	struct rockchip_sfc *sfc = platform_get_drvdata(pdev);
+ 	struct spi_controller *host = sfc->host;
  
  	spi_unregister_controller(host);
 +	free_pages((unsigned long)sfc->buffer, get_order(sfc->max_iosize));
  
  	clk_disable_unprepare(sfc->clk);
  	clk_disable_unprepare(sfc->hclk);