kernel: bump 5.15 to 5.15.83

[openwrt/openwrt.git] / target / linux / mediatek / patches-5.15 / 213-spi-mediatek-add-mt7986-spi-support.patch

diff --git a/target/linux/mediatek/patches-5.15/213-spi-mediatek-add-mt7986-spi-support.patch b/target/linux/mediatek/patches-5.15/213-spi-mediatek-add-mt7986-spi-support.patch
index f10d57a785364b245e73198a4ac84f2d80836000..04da1765f378730552ffe438f7fb00602f17ce73 100644 (file)
--- a/target/linux/mediatek/patches-5.15/213-spi-mediatek-add-mt7986-spi-support.patch
+++ b/target/linux/mediatek/patches-5.15/213-spi-mediatek-add-mt7986-spi-support.patch
@@ -816,7 +816,7 @@ Signed-off-by: Sam Shih <sam.shih@mediatek.com>
  err_put_master:
        spi_master_put(master);
  
-@@ -917,8 +1296,10 @@ static int mtk_spi_remove(struct platfor
+@@ -920,8 +1299,10 @@ static int mtk_spi_remove(struct platfor
  
        mtk_spi_reset(mdata);
  
@@ -826,9 +826,9 @@ Signed-off-by: Sam Shih <sam.shih@mediatek.com>
 +              clk_unprepare(mdata->spi_hclk);
 +      }
  
-       return 0;
- }
-@@ -934,8 +1315,10 @@ static int mtk_spi_suspend(struct device
+       pm_runtime_put_noidle(&pdev->dev);
+       pm_runtime_disable(&pdev->dev);
+@@ -940,8 +1321,10 @@ static int mtk_spi_suspend(struct device
        if (ret)
                return ret;
  
@@ -840,7 +840,7 @@ Signed-off-by: Sam Shih <sam.shih@mediatek.com>
  
        return ret;
  }
-@@ -952,11 +1335,20 @@ static int mtk_spi_resume(struct device
+@@ -958,11 +1341,20 @@ static int mtk_spi_resume(struct device
                        dev_err(dev, "failed to enable spi_clk (%d)\n", ret);
                        return ret;
                }
@@ -862,7 +862,7 @@ Signed-off-by: Sam Shih <sam.shih@mediatek.com>
  
        return ret;
  }
-@@ -968,10 +1360,13 @@ static int mtk_spi_runtime_suspend(struc
+@@ -974,10 +1366,13 @@ static int mtk_spi_runtime_suspend(struc
        struct spi_master *master = dev_get_drvdata(dev);
        struct mtk_spi *mdata = spi_master_get_devdata(master);
  
@@ -878,7 +878,7 @@ Signed-off-by: Sam Shih <sam.shih@mediatek.com>
  
        return 0;
  }
-@@ -982,13 +1377,31 @@ static int mtk_spi_runtime_resume(struct
+@@ -988,13 +1383,31 @@ static int mtk_spi_runtime_resume(struct
        struct mtk_spi *mdata = spi_master_get_devdata(master);
        int ret;