spi: Merge up fixes to help CI

Get the fixes into CI for development.

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/spi/spi-cadence.c
Simple merge

diff --cc drivers/spi/spi-fsl-lpspi.c
Simple merge

diff --cc drivers/spi/spi-geni-qcom.c
Simple merge

diff --cc drivers/spi/spi-mt65xx.c
index ef64fc2,d7432e2..39272ad
--- 1/drivers/spi/spi-mt65xx.c
--- 2/drivers/spi/spi-mt65xx.c
+++ b/drivers/spi/spi-mt65xx.c
@@@ -1276,21 -1275,18 +1276,24 @@@ static void mtk_spi_remove(struct platf
        struct mtk_spi *mdata = spi_master_get_devdata(master);
        int ret;
  
 -      ret = pm_runtime_resume_and_get(&pdev->dev);
 -      if (ret < 0)
 -              return ret;
 -
 -      mtk_spi_reset(mdata);
+       if (mdata->use_spimem && !completion_done(&mdata->spimem_done))
+               complete(&mdata->spimem_done);
+ 
 +      ret = pm_runtime_get_sync(&pdev->dev);
 +      if (ret < 0) {
 +              dev_warn(&pdev->dev, "Failed to resume hardware (%pe)\n", ERR_PTR(ret));
 +      } else {
 +              /*
 +               * If pm runtime resume failed, clks are disabled and
 +               * unprepared. So don't access the hardware and skip clk
 +               * unpreparing.
 +               */
 +              mtk_spi_reset(mdata);
  
 -      if (mdata->dev_comp->no_need_unprepare) {
 -              clk_unprepare(mdata->spi_clk);
 -              clk_unprepare(mdata->spi_hclk);
 +              if (mdata->dev_comp->no_need_unprepare) {
 +                      clk_unprepare(mdata->spi_clk);
 +                      clk_unprepare(mdata->spi_hclk);
 +              }
        }
  
        pm_runtime_put_noidle(&pdev->dev);