microchipsw: 6.18: refresh patches

Refresh the patches for 6.18 so they apply.

Signed-off-by: Robert Marko <robert.marko@sartura.hr>

diff --git a/target/linux/microchipsw/patches-6.18/0095-v6.19-reset-sparx5-add-LAN969x-support.patch b/target/linux/microchipsw/patches-6.18/0095-v6.19-reset-sparx5-add-LAN969x-support.patch
index 154af04e3a7e6f938567e215e5b4642f250b8c9a..07873c236b27d0c0833c1b4142969b66e80bd75a 100644 (file)
--- a/target/linux/microchipsw/patches-6.18/0095-v6.19-reset-sparx5-add-LAN969x-support.patch
+++ b/target/linux/microchipsw/patches-6.18/0095-v6.19-reset-sparx5-add-LAN969x-support.patch
@@ -16,12 +16,12 @@ Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
 
 --- a/drivers/reset/Kconfig
 +++ b/drivers/reset/Kconfig
-@@ -147,7 +147,7 @@ config RESET_LPC18XX
+@@ -170,7 +170,7 @@ config RESET_LPC18XX
  
  config RESET_MCHP_SPARX5
-       bool "Microchip Sparx5 reset driver"
--      depends on ARCH_SPARX5 || SOC_LAN966 || COMPILE_TEST
-+      depends on ARCH_SPARX5 || ARCH_LAN969X || SOC_LAN966 || COMPILE_TEST
+       tristate "Microchip Sparx5 reset driver"
+-      depends on ARCH_SPARX5 || SOC_LAN966 || MCHP_LAN966X_PCI || COMPILE_TEST
++      depends on ARCH_SPARX5 || ARCH_LAN969X || SOC_LAN966 || MCHP_LAN966X_PCI || COMPILE_TEST
        default y if SPARX5_SWITCH
        select MFD_SYSCON
        help

diff --git a/target/linux/microchipsw/patches-6.18/0096-v6.20-dmaengine-at_xdmac-get-the-number-of-DMA-channels-fr.patch b/target/linux/microchipsw/patches-6.18/0096-v6.20-dmaengine-at_xdmac-get-the-number-of-DMA-channels-fr.patch
index f9d56a42d675ff7b3989359c5e4258beaa4abe09..4c255ffc07f72ffacc8a0864af01a5ba49c74f75 100644 (file)
--- a/target/linux/microchipsw/patches-6.18/0096-v6.20-dmaengine-at_xdmac-get-the-number-of-DMA-channels-fr.patch
+++ b/target/linux/microchipsw/patches-6.18/0096-v6.20-dmaengine-at_xdmac-get-the-number-of-DMA-channels-fr.patch
@@ -23,7 +23,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
 
 --- a/drivers/dma/at_xdmac.c
 +++ b/drivers/dma/at_xdmac.c
-@@ -2259,12 +2259,29 @@ static int __maybe_unused atmel_xdmac_ru
+@@ -2257,12 +2257,29 @@ static int __maybe_unused atmel_xdmac_ru
        return clk_enable(atxdmac->clk);
  }
  
@@ -55,7 +55,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
  
        irq = platform_get_irq(pdev, 0);
        if (irq < 0)
-@@ -2280,7 +2297,10 @@ static int at_xdmac_probe(struct platfor
+@@ -2278,7 +2295,10 @@ static int at_xdmac_probe(struct platfor
         * of channels to do the allocation.
         */
        reg = readl_relaxed(base + AT_XDMAC_GTYPE);

diff --git a/target/linux/microchipsw/patches-6.18/0097-v6.19-net-sparx5-lan969x-populate-netdev-of_node.patch b/target/linux/microchipsw/patches-6.18/0097-v6.19-net-sparx5-lan969x-populate-netdev-of_node.patch
index d1eccda589e59750a953da68891bf76c26f3104b..5de21b347ce2c290614845c15b738ee30d644bc0 100644 (file)
--- a/target/linux/microchipsw/patches-6.18/0097-v6.19-net-sparx5-lan969x-populate-netdev-of_node.patch
+++ b/target/linux/microchipsw/patches-6.18/0097-v6.19-net-sparx5-lan969x-populate-netdev-of_node.patch
@@ -15,7 +15,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
 
 --- a/drivers/net/ethernet/microchip/sparx5/sparx5_main.c
 +++ b/drivers/net/ethernet/microchip/sparx5/sparx5_main.c
-@@ -396,6 +396,8 @@ static int sparx5_create_port(struct spa
+@@ -395,6 +395,8 @@ static int sparx5_create_port(struct spa
  
        spx5_port->phylink = phylink;
  

diff --git a/target/linux/microchipsw/patches-6.18/105-hwmon-sparx5-make-it-selectable-for-ARCH_MICROCHIP.patch b/target/linux/microchipsw/patches-6.18/105-hwmon-sparx5-make-it-selectable-for-ARCH_MICROCHIP.patch
index 6648f5fa3b02a37e3df3ffe544f62d35b11636f9..f491a43b5c5281bf017582a59f03b9419b6689df 100644 (file)
--- a/target/linux/microchipsw/patches-6.18/105-hwmon-sparx5-make-it-selectable-for-ARCH_MICROCHIP.patch
+++ b/target/linux/microchipsw/patches-6.18/105-hwmon-sparx5-make-it-selectable-for-ARCH_MICROCHIP.patch
@@ -13,7 +13,7 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
 
 --- a/drivers/hwmon/Kconfig
 +++ b/drivers/hwmon/Kconfig
-@@ -602,7 +602,7 @@ config SENSORS_I5K_AMB
+@@ -632,7 +632,7 @@ config SENSORS_I5K_AMB
  
  config SENSORS_SPARX5
        tristate "Sparx5 SoC temperature sensor"

diff --git a/target/linux/microchipsw/patches-6.18/108-mmc-sdhci-of-at91-add-compatible-to-sama7g5-SoC.patch b/target/linux/microchipsw/patches-6.18/108-mmc-sdhci-of-at91-add-compatible-to-sama7g5-SoC.patch
index 2e72783fb7c77548ea39b549b2d819ef4321ceb9..f5f0f393166b032d200c0680e55675116bce7b16 100644 (file)
--- a/target/linux/microchipsw/patches-6.18/108-mmc-sdhci-of-at91-add-compatible-to-sama7g5-SoC.patch
+++ b/target/linux/microchipsw/patches-6.18/108-mmc-sdhci-of-at91-add-compatible-to-sama7g5-SoC.patch
@@ -59,7 +59,7 @@ Signed-off-by: Andrei Simion <andrei.simion@microchip.com>
        writew(SDHCI_AT91_PRESET_COMMON_CONF | preset_div,
               host->ioaddr + SDHCI_PRESET_FOR_SDR104);
        preset_div = DIV_ROUND_UP(gck_rate, 50000000) - 1;
-@@ -425,8 +437,9 @@ static int sdhci_at91_probe(struct platf
+@@ -413,8 +425,9 @@ static int sdhci_at91_probe(struct platf
        pm_runtime_set_autosuspend_delay(&pdev->dev, 50);
        pm_runtime_use_autosuspend(&pdev->dev);
  

diff --git a/target/linux/microchipsw/patches-6.18/109-mmc-sdhci-of-at91-add-support-for-HS400-and-HS400ES.patch b/target/linux/microchipsw/patches-6.18/109-mmc-sdhci-of-at91-add-support-for-HS400-and-HS400ES.patch
index 57837a87f5c52836586e10e1a36b11146c702fc1..025d67d70e3314dd91d34a211b12a7d40839e18e 100644 (file)
--- a/target/linux/microchipsw/patches-6.18/109-mmc-sdhci-of-at91-add-support-for-HS400-and-HS400ES.patch
+++ b/target/linux/microchipsw/patches-6.18/109-mmc-sdhci-of-at91-add-support-for-HS400-and-HS400ES.patch
@@ -63,8 +63,8 @@ Signed-off-by: Andrei Simion <andrei.simion@microchip.com>
        sdhci_set_uhs_signaling(host, timing);
  
        /* reenable SDCLK */
-@@ -366,6 +383,20 @@ static const struct dev_pm_ops sdhci_at9
-                          NULL)
+@@ -360,6 +377,20 @@ static const struct dev_pm_ops sdhci_at9
+       RUNTIME_PM_OPS(sdhci_at91_runtime_suspend, sdhci_at91_runtime_resume, NULL)
  };
  
 +static void at91_sdhci_hs400_enhanced_strobe(struct mmc_host *mmc, struct mmc_ios *ios)
@@ -84,7 +84,7 @@ Signed-off-by: Andrei Simion <andrei.simion@microchip.com>
  static int sdhci_at91_probe(struct platform_device *pdev)
  {
        const struct sdhci_at91_soc_data        *soc_data;
-@@ -445,6 +476,8 @@ static int sdhci_at91_probe(struct platf
+@@ -433,6 +464,8 @@ static int sdhci_at91_probe(struct platf
        if (ret)
                goto pm_runtime_disable;
  

diff --git a/target/linux/microchipsw/patches-6.18/110-sdhci-sdhci-of-at91-issue-IP-reset-at-probe.patch b/target/linux/microchipsw/patches-6.18/110-sdhci-sdhci-of-at91-issue-IP-reset-at-probe.patch
index 8dab7e793502326a1b7810890fe9c760d427f499..cb465f07c396f038a54b64319efb872ec74ca401 100644 (file)
--- a/target/linux/microchipsw/patches-6.18/110-sdhci-sdhci-of-at91-issue-IP-reset-at-probe.patch
+++ b/target/linux/microchipsw/patches-6.18/110-sdhci-sdhci-of-at91-issue-IP-reset-at-probe.patch
@@ -16,7 +16,7 @@ Signed-off-by: Andrei Simion <andrei.simion@microchip.com>
 
 --- a/drivers/mmc/host/sdhci-of-at91.c
 +++ b/drivers/mmc/host/sdhci-of-at91.c
-@@ -417,6 +417,9 @@ static int sdhci_at91_probe(struct platf
+@@ -411,6 +411,9 @@ static int sdhci_at91_probe(struct platf
        priv = sdhci_pltfm_priv(pltfm_host);
        priv->soc_data = soc_data;
  
@@ -25,4 +25,4 @@ Signed-off-by: Andrei Simion <andrei.simion@microchip.com>
 +
        priv->mainck = devm_clk_get(&pdev->dev, "baseclk");
        if (IS_ERR(priv->mainck)) {
-               if (soc_data->baseclk_is_generated_internally) {
+               if (soc_data->baseclk_is_generated_internally)

diff --git a/target/linux/microchipsw/patches-6.18/111-mmc-sdhci-of-at91-perform-a-hardware-reset-at-probe-.patch b/target/linux/microchipsw/patches-6.18/111-mmc-sdhci-of-at91-perform-a-hardware-reset-at-probe-.patch
index 85e3398ad98f6a7d7534243e13e2985a0efaeb90..57e5092d702567d7b01b11facc076c92e43887fd 100644 (file)
--- a/target/linux/microchipsw/patches-6.18/111-mmc-sdhci-of-at91-perform-a-hardware-reset-at-probe-.patch
+++ b/target/linux/microchipsw/patches-6.18/111-mmc-sdhci-of-at91-perform-a-hardware-reset-at-probe-.patch
@@ -17,7 +17,7 @@ Signed-off-by: Andrei Simion <andrei.simion@microchip.com>
 
 --- a/drivers/mmc/host/sdhci-of-at91.c
 +++ b/drivers/mmc/host/sdhci-of-at91.c
-@@ -419,6 +419,8 @@ static int sdhci_at91_probe(struct platf
+@@ -413,6 +413,8 @@ static int sdhci_at91_probe(struct platf
  
        /* Perform a software reset before using the IP */
        sdhci_at91_reset(host, SDHCI_RESET_ALL);

diff --git a/target/linux/microchipsw/patches-6.18/113-mmc-sdhci-of-at91-disable-selectively-clocks-on-pm-r.patch b/target/linux/microchipsw/patches-6.18/113-mmc-sdhci-of-at91-disable-selectively-clocks-on-pm-r.patch
index 5dffdb5a00462ce0618b5aa33ad3e5d51cd7e291..f6720de4c54afe4291e91df6515c8df40d6daaff 100644 (file)
--- a/target/linux/microchipsw/patches-6.18/113-mmc-sdhci-of-at91-disable-selectively-clocks-on-pm-r.patch
+++ b/target/linux/microchipsw/patches-6.18/113-mmc-sdhci-of-at91-disable-selectively-clocks-on-pm-r.patch
@@ -39,7 +39,7 @@ Signed-off-by: Andrei Simion <andrei.simion@microchip.com>
  };
  
  static const struct sdhci_at91_soc_data soc_data_sama7g5 = {
-@@ -336,9 +339,11 @@ static int sdhci_at91_runtime_suspend(st
+@@ -332,9 +335,11 @@ static int sdhci_at91_runtime_suspend(st
        if (host->tuning_mode != SDHCI_TUNING_MODE_3)
                mmc_retune_needed(host->mmc);
  
@@ -52,9 +52,9 @@ Signed-off-by: Andrei Simion <andrei.simion@microchip.com>
 +              clk_disable_unprepare(priv->mainck);
 +      }
  
-       return ret;
+       return 0;
  }
-@@ -359,6 +364,9 @@ static int sdhci_at91_runtime_resume(str
+@@ -355,6 +360,9 @@ static int sdhci_at91_runtime_resume(str
                goto out;
        }
  

diff --git a/target/linux/microchipsw/patches-6.18/116-mmc-sdhci-of-at91-add-soc-data-field-quirks2.patch b/target/linux/microchipsw/patches-6.18/116-mmc-sdhci-of-at91-add-soc-data-field-quirks2.patch
index 69d2562413ff837cc49060581fda870b2e67360f..93e7675576c1bc14617c8cabbfff695dff7d7707 100644 (file)
--- a/target/linux/microchipsw/patches-6.18/116-mmc-sdhci-of-at91-add-soc-data-field-quirks2.patch
+++ b/target/linux/microchipsw/patches-6.18/116-mmc-sdhci-of-at91-add-soc-data-field-quirks2.patch
@@ -37,7 +37,7 @@ Signed-off-by: Andrei Simion <andrei.simion@microchip.com>
  };
  
  static const struct sdhci_at91_soc_data soc_data_sam9x60 = {
-@@ -506,9 +506,7 @@ static int sdhci_at91_probe(struct platf
+@@ -494,9 +494,7 @@ static int sdhci_at91_probe(struct platf
        pm_runtime_set_autosuspend_delay(&pdev->dev, 50);
        pm_runtime_use_autosuspend(&pdev->dev);
  

diff --git a/target/linux/microchipsw/patches-6.18/117-mmc-introduce-SDHCI_QUIRK2_AT91_HS400_PRESET.patch b/target/linux/microchipsw/patches-6.18/117-mmc-introduce-SDHCI_QUIRK2_AT91_HS400_PRESET.patch
index 8c72d543e621a5790031f476cd20ee4cdf6e31c2..e3e2f9de2464ffccd61a162cde4613e8430c3bcc 100644 (file)
--- a/target/linux/microchipsw/patches-6.18/117-mmc-introduce-SDHCI_QUIRK2_AT91_HS400_PRESET.patch
+++ b/target/linux/microchipsw/patches-6.18/117-mmc-introduce-SDHCI_QUIRK2_AT91_HS400_PRESET.patch
@@ -16,15 +16,15 @@ Signed-off-by: Andrei Simion <andrei.simion@microchip.com>
 
 --- a/drivers/mmc/host/sdhci.h
 +++ b/drivers/mmc/host/sdhci.h
-@@ -270,6 +270,7 @@
+@@ -317,6 +317,7 @@
  #define SDHCI_PRESET_FOR_SDR104        0x6C
  #define SDHCI_PRESET_FOR_DDR50 0x6E
  #define SDHCI_PRESET_FOR_HS400 0x74 /* Non-standard */
 +#define SDHCI_PRESET_FOR_HS400_AT91   0x244 /* AT91 specific */
- #define SDHCI_PRESET_DRV_MASK         GENMASK(15, 14)
- #define SDHCI_PRESET_CLKGEN_SEL               BIT(10)
- #define SDHCI_PRESET_SDCLK_FREQ_MASK  GENMASK(9, 0)
-@@ -484,6 +485,10 @@ struct sdhci_host {
+ 
+ /* UHS2 */
+ #define SDHCI_PRESET_FOR_UHS2  0x74
+@@ -536,6 +537,10 @@ struct sdhci_host {
  #define SDHCI_QUIRK2_USE_32BIT_BLK_CNT                        (1<<18)
  /* Issue CMD and DATA reset together */
  #define SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER     (1<<19)

diff --git a/target/linux/microchipsw/patches-6.18/119-spi-atmel-quadspi-Add-support-for-LAN969x-QSPI0.patch b/target/linux/microchipsw/patches-6.18/119-spi-atmel-quadspi-Add-support-for-LAN969x-QSPI0.patch
index cd32fcd8b2ea863623f825a6643b05536bf4ad58..113334e45e84678caba934ccd6ecbdf4b6fabb10 100644 (file)
--- a/target/linux/microchipsw/patches-6.18/119-spi-atmel-quadspi-Add-support-for-LAN969x-QSPI0.patch
+++ b/target/linux/microchipsw/patches-6.18/119-spi-atmel-quadspi-Add-support-for-LAN969x-QSPI0.patch
@@ -17,7 +17,7 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
 
 --- a/drivers/spi/Kconfig
 +++ b/drivers/spi/Kconfig
-@@ -147,7 +147,7 @@ config SPI_AT91_USART
+@@ -180,7 +180,7 @@ config SPI_AT91_USART
  
  config SPI_ATMEL_QUADSPI
        tristate "Atmel Quad SPI Controller"
@@ -28,7 +28,7 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
          This enables support for the Quad SPI controller in master mode.
 --- a/drivers/spi/atmel-quadspi.c
 +++ b/drivers/spi/atmel-quadspi.c
-@@ -1053,9 +1053,9 @@ static int atmel_qspi_set_pad_calibratio
+@@ -1052,9 +1052,9 @@ static int atmel_qspi_set_pad_calibratio
                                          ATMEL_QSPI_TIMEOUT);
  
        /* Refresh analogic blocks every 1 ms.*/
@@ -40,7 +40,7 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
  
        return ret;
  }
-@@ -1114,7 +1114,7 @@ static int atmel_qspi_sama7g5_init(struc
+@@ -1113,7 +1113,7 @@ static int atmel_qspi_sama7g5_init(struc
         * Check if the SoC supports pad calibration in Octal SPI mode.
         * Proceed only if both the capabilities are true.
         */
@@ -49,7 +49,7 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
                ret = atmel_qspi_set_pad_calibration(aq);
                if (ret)
                        return ret;
-@@ -1649,6 +1649,17 @@ static const struct atmel_qspi_caps atme
+@@ -1672,6 +1672,17 @@ static const struct atmel_qspi_caps atme
        .has_dllon = true,
  };
  
@@ -67,7 +67,7 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
  static const struct of_device_id atmel_qspi_dt_ids[] = {
        {
                .compatible = "atmel,sama5d2-qspi",
-@@ -1678,6 +1689,10 @@ static const struct of_device_id atmel_q
+@@ -1701,6 +1712,10 @@ static const struct of_device_id atmel_q
                .compatible = "microchip,sama7d65-qspi",
                .data = &atmel_sama7d65_qspi_caps,
        },

diff --git a/target/linux/microchipsw/patches-6.18/121-nvmem-lan9662-otp-add-support-for-LAN969x.patch b/target/linux/microchipsw/patches-6.18/121-nvmem-lan9662-otp-add-support-for-LAN969x.patch
index c317ebdab89200439dfee1f762c2b033bc1e43d6..bdd388fc7d82e30d0ea01d00f03d53cecda62bb4 100644 (file)
--- a/target/linux/microchipsw/patches-6.18/121-nvmem-lan9662-otp-add-support-for-LAN969x.patch
+++ b/target/linux/microchipsw/patches-6.18/121-nvmem-lan9662-otp-add-support-for-LAN969x.patch
@@ -15,7 +15,7 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
 
 --- a/drivers/nvmem/Kconfig
 +++ b/drivers/nvmem/Kconfig
-@@ -127,7 +127,7 @@ config NVMEM_JZ4780_EFUSE
+@@ -150,7 +150,7 @@ config NVMEM_JZ4780_EFUSE
  
  config NVMEM_LAN9662_OTPC
        tristate "Microchip LAN9662 OTP controller support"

diff --git a/target/linux/microchipsw/patches-6.18/128-net-sparx5-add-MTU-change.patch b/target/linux/microchipsw/patches-6.18/128-net-sparx5-add-MTU-change.patch
index d628ac89143e6e54c402442943c67363d85a8772..9edbcb43d50c13aacd902e7c1c1fab87bc6ef0a0 100644 (file)
--- a/target/linux/microchipsw/patches-6.18/128-net-sparx5-add-MTU-change.patch
+++ b/target/linux/microchipsw/patches-6.18/128-net-sparx5-add-MTU-change.patch
@@ -86,7 +86,7 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
 +}
 --- a/drivers/net/ethernet/microchip/sparx5/sparx5_main.c
 +++ b/drivers/net/ethernet/microchip/sparx5/sparx5_main.c
-@@ -1108,6 +1108,8 @@ static const struct sparx5_ops sparx5_op
+@@ -1107,6 +1107,8 @@ static const struct sparx5_ops sparx5_op
        .fdma_deinit             = &sparx5_fdma_deinit,
        .fdma_poll               = &sparx5_fdma_napi_callback,
        .fdma_xmit               = &sparx5_fdma_xmit,