spi: Merge up v6.13-rc6

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

diff --cc drivers/spi/spi-rockchip-sfc.c
index 956363859b91e9d596c383a168e1cfdd75cfa4fa,70bbb459caa4f58ac5a76423b554ed624d295294..59de351499a0813077cf5c7b7ddd1286e13d22b0
--- 1/drivers/spi/spi-rockchip-sfc.c
--- 2/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);