rockchip: refresh kernel patches

This was not refresh before because of a merge race.

Fixes: 4c942c06b8f0 ("kernel: bump 6.18 to 6.18.27")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/target/linux/rockchip/patches-6.18/037-04-v6.19-mmc-sdhci-of-dwcmshc-Add-command-queue-support-for-rockch.patch b/target/linux/rockchip/patches-6.18/037-04-v6.19-mmc-sdhci-of-dwcmshc-Add-command-queue-support-for-rockch.patch
index 43b3d1e27d1f189de658ee49c45cac6bb4f79186..3771d7f3cf29bb1c0e730c857fa08737dec68188 100644 (file)
--- a/target/linux/rockchip/patches-6.18/037-04-v6.19-mmc-sdhci-of-dwcmshc-Add-command-queue-support-for-rockch.patch
+++ b/target/linux/rockchip/patches-6.18/037-04-v6.19-mmc-sdhci-of-dwcmshc-Add-command-queue-support-for-rockch.patch
@@ -117,7 +117,7 @@ Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
  static void dwcmshc_rk3568_set_clock(struct sdhci_host *host, unsigned int clock)
  {
        struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
-@@ -699,6 +765,10 @@ static void rk35xx_sdhci_reset(struct sd
+@@ -712,6 +778,10 @@ static void rk35xx_sdhci_reset(struct sd
        struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
        struct dwcmshc_priv *dwc_priv = sdhci_pltfm_priv(pltfm_host);
        struct rk35xx_priv *priv = dwc_priv->priv;
@@ -128,7 +128,7 @@ Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
  
        if (mask & SDHCI_RESET_ALL && priv->reset) {
                reset_control_assert(priv->reset);
-@@ -707,6 +777,9 @@ static void rk35xx_sdhci_reset(struct sd
+@@ -720,6 +790,9 @@ static void rk35xx_sdhci_reset(struct sd
        }
  
        sdhci_reset(host, mask);
@@ -138,7 +138,7 @@ Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
  }
  
  static int dwcmshc_rk35xx_init(struct device *dev, struct sdhci_host *host,
-@@ -1200,6 +1273,15 @@ static const struct dwcmshc_pltfm_data s
+@@ -1213,6 +1286,15 @@ static const struct dwcmshc_pltfm_data s
  };
  #endif
  
@@ -154,7 +154,7 @@ Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
  static const struct dwcmshc_pltfm_data sdhci_dwcmshc_rk35xx_pdata = {
        .pdata = {
                .ops = &sdhci_dwcmshc_rk35xx_ops,
-@@ -1208,6 +1290,7 @@ static const struct dwcmshc_pltfm_data s
+@@ -1221,6 +1303,7 @@ static const struct dwcmshc_pltfm_data s
                .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
                           SDHCI_QUIRK2_CLOCK_DIV_ZERO_BROKEN,
        },
@@ -162,7 +162,7 @@ Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
        .init = dwcmshc_rk35xx_init,
        .postinit = dwcmshc_rk35xx_postinit,
  };
-@@ -1257,7 +1340,8 @@ static const struct cqhci_host_ops dwcms
+@@ -1270,7 +1353,8 @@ static const struct cqhci_host_ops dwcms
        .set_tran_desc  = dwcmshc_set_tran_desc,
  };
  
@@ -172,7 +172,7 @@ Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
  {
        struct cqhci_host *cq_host;
        struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
-@@ -1287,7 +1371,10 @@ static void dwcmshc_cqhci_init(struct sd
+@@ -1300,7 +1384,10 @@ static void dwcmshc_cqhci_init(struct sd
        }
  
        cq_host->mmio = host->ioaddr + priv->vendor_specific_area2;
@@ -184,7 +184,7 @@ Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
  
        /* Enable using of 128-bit task descriptors */
        dma64 = host->flags & SDHCI_USE_64_BIT_DMA;
-@@ -1455,7 +1542,7 @@ static int dwcmshc_probe(struct platform
+@@ -1468,7 +1555,7 @@ static int dwcmshc_probe(struct platform
                priv->vendor_specific_area2 =
                        sdhci_readw(host, DWCMSHC_P_VENDOR_AREA2);
  

diff --git a/target/linux/rockchip/patches-6.18/037-05-v6.19-mmc-sdhci-of-dwcmshc-Fix-command-queue-support-for-RK3576.patch b/target/linux/rockchip/patches-6.18/037-05-v6.19-mmc-sdhci-of-dwcmshc-Fix-command-queue-support-for-RK3576.patch
index d5d421a13159c75ce674e36fe639dea3a9df7bd4..ff443fb97f04c3a16c8400f4676a881dc35e6594 100644 (file)
--- a/target/linux/rockchip/patches-6.18/037-05-v6.19-mmc-sdhci-of-dwcmshc-Fix-command-queue-support-for-RK3576.patch
+++ b/target/linux/rockchip/patches-6.18/037-05-v6.19-mmc-sdhci-of-dwcmshc-Fix-command-queue-support-for-RK3576.patch
@@ -45,7 +45,7 @@ Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
 
 --- a/drivers/mmc/host/sdhci-of-dwcmshc.c
 +++ b/drivers/mmc/host/sdhci-of-dwcmshc.c
-@@ -1303,6 +1303,7 @@ static const struct dwcmshc_pltfm_data s
+@@ -1316,6 +1316,7 @@ static const struct dwcmshc_pltfm_data s
                .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
                           SDHCI_QUIRK2_CLOCK_DIV_ZERO_BROKEN,
        },

diff --git a/target/linux/rockchip/patches-6.18/037-06-v6.19-mmc-sdhci-of-dwcmshc-Disable-internal-clock-auto-gate-for.patch b/target/linux/rockchip/patches-6.18/037-06-v6.19-mmc-sdhci-of-dwcmshc-Disable-internal-clock-auto-gate-for.patch
index f349d626f40eb92f397b1eaa44c42adc85e47866..8549dc5331d9f1ab1b25f0402b71e1cbc3844021 100644 (file)
--- a/target/linux/rockchip/patches-6.18/037-06-v6.19-mmc-sdhci-of-dwcmshc-Disable-internal-clock-auto-gate-for.patch
+++ b/target/linux/rockchip/patches-6.18/037-06-v6.19-mmc-sdhci-of-dwcmshc-Disable-internal-clock-auto-gate-for.patch
@@ -39,4 +39,4 @@ Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
 +      extra |= BIT(4);
        sdhci_writel(host, extra, reg);
  
-       if (clock <= 52000000) {
+       /* Disable clock while config DLL */