openwrt-mirror/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2026-06-17 14:50:15 +04:00
Code Issues Packages Projects Releases Wiki Activity

rockchip: refresh kernel patches

Browse Source 
This was not refresh before because of a merge race.

Fixes: 4c942c06b8 ("kernel: bump 6.18 to 6.18.27")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Hauke Mehrtens
2026-05-09 13:39:34 +02:00
parent 716661d562
commit 66aa0bc397
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
target/linux/rockchip/patches-6.18/037-04-v6.19-mmc-sdhci-of-dwcmshc-Add-command-queue-support-for-rockch.patch
+7 -7
View File
@@ -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);
target/linux/rockchip/patches-6.18/037-05-v6.19-mmc-sdhci-of-dwcmshc-Fix-command-queue-support-for-RK3576.patch
+1 -1
View File
@@ -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,
},
target/linux/rockchip/patches-6.18/037-06-v6.19-mmc-sdhci-of-dwcmshc-Disable-internal-clock-auto-gate-for.patch
+1 -1
View File
@@ -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 */