kernel: bump 6.1 to 6.1.83

[openwrt/openwrt.git] / target / linux / mediatek / patches-6.1 / 434-drivers-spi-mt65xx-Add-controller-s-calibration-para.patch

diff --git a/target/linux/mediatek/patches-6.1/434-drivers-spi-mt65xx-Add-controller-s-calibration-para.patch b/target/linux/mediatek/patches-6.1/434-drivers-spi-mt65xx-Add-controller-s-calibration-para.patch
index a64d6229819bac7182456be37258818ed148f8ba..dbdb1947aa2e63e7b0ad2366061871c7217832b9 100644 (file)
--- a/target/linux/mediatek/patches-6.1/434-drivers-spi-mt65xx-Add-controller-s-calibration-para.patch
+++ b/target/linux/mediatek/patches-6.1/434-drivers-spi-mt65xx-Add-controller-s-calibration-para.patch
@@ -11,7 +11,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
 
 --- a/drivers/spi/spi-mt65xx.c
 +++ b/drivers/spi/spi-mt65xx.c
-@@ -800,6 +800,21 @@ static irqreturn_t mtk_spi_interrupt(int
+@@ -834,6 +834,21 @@ static irqreturn_t mtk_spi_interrupt(int
        return IRQ_HANDLED;
  }
  
@@ -33,11 +33,11 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
  static int mtk_spi_mem_adjust_op_size(struct spi_mem *mem,
                                      struct spi_mem_op *op)
  {
-@@ -1092,6 +1107,7 @@ static int mtk_spi_probe(struct platform
+@@ -1124,6 +1139,7 @@ static int mtk_spi_probe(struct platform
        master->setup = mtk_spi_setup;
        master->set_cs_timing = mtk_spi_set_hw_cs_timing;
        master->use_gpio_descriptors = true;
 +      master->append_caldata = mtk_spi_append_caldata;
  
-       of_id = of_match_node(mtk_spi_of_match, pdev->dev.of_node);
-       if (!of_id) {
+       mdata = spi_master_get_devdata(master);
+       mdata->dev_comp = device_get_match_data(dev);