From 4619da96588dcde584a6296ca29976547e7442c4 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Fri, 10 May 2024 20:04:18 +0800 Subject: [PATCH] rockchip: refresh kernel patches Signed-off-by: Tianling Shen --- ...drm-rockchip-Embed-drm_encoder-into-rockchip_decoder.patch | 4 ++-- ...ore-Improve-fallback-to-speed-modes-if-eMMC-HS200-fa.patch | 2 +- ...et-ethernet-stmmac-add-devname-configuration-from-OF.patch | 4 ++-- ...ip-gic-v3-its-add-GFP_DMA32-flag-for-memory-allocate.patch | 4 ++-- ...-02-irqchip-gic-v3-its-force-to-config-its-tables-as.patch | 2 +- ...-04-irqchip-gic-v3-its-force-to-config-its-tables-as.patch | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/target/linux/rockchip/patches-5.15/008-0028-v5.19-drm-rockchip-Embed-drm_encoder-into-rockchip_decoder.patch b/target/linux/rockchip/patches-5.15/008-0028-v5.19-drm-rockchip-Embed-drm_encoder-into-rockchip_decoder.patch index 8272de8a36..5830c45655 100644 --- a/target/linux/rockchip/patches-5.15/008-0028-v5.19-drm-rockchip-Embed-drm_encoder-into-rockchip_decoder.patch +++ b/target/linux/rockchip/patches-5.15/008-0028-v5.19-drm-rockchip-Embed-drm_encoder-into-rockchip_decoder.patch @@ -577,7 +577,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20220422072841.2206452-3-s.h static inline void rk3288_writel(struct rockchip_lvds *lvds, u32 offset, u32 val) { -@@ -604,7 +610,7 @@ static int rockchip_lvds_bind(struct dev +@@ -603,7 +609,7 @@ static int rockchip_lvds_bind(struct dev goto err_put_remote; } @@ -586,7 +586,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20220422072841.2206452-3-s.h encoder->possible_crtcs = drm_of_find_possible_crtcs(drm_dev, dev->of_node); -@@ -669,10 +675,10 @@ static void rockchip_lvds_unbind(struct +@@ -668,10 +674,10 @@ static void rockchip_lvds_unbind(struct const struct drm_encoder_helper_funcs *encoder_funcs; encoder_funcs = lvds->soc_data->helper_funcs; diff --git a/target/linux/rockchip/patches-5.15/010-v5.18-mmc-core-Improve-fallback-to-speed-modes-if-eMMC-HS200-fa.patch b/target/linux/rockchip/patches-5.15/010-v5.18-mmc-core-Improve-fallback-to-speed-modes-if-eMMC-HS200-fa.patch index 8f629fbeac..96f8775042 100644 --- a/target/linux/rockchip/patches-5.15/010-v5.18-mmc-core-Improve-fallback-to-speed-modes-if-eMMC-HS200-fa.patch +++ b/target/linux/rockchip/patches-5.15/010-v5.18-mmc-core-Improve-fallback-to-speed-modes-if-eMMC-HS200-fa.patch @@ -25,7 +25,7 @@ Link: https://lore.kernel.org/r/20220303164522.129583-1-ulf.hansson@linaro.org --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c -@@ -1530,13 +1530,23 @@ static int mmc_select_timing(struct mmc_ +@@ -1532,13 +1532,23 @@ static int mmc_select_timing(struct mmc_ if (!mmc_can_ext_csd(card)) goto bus_speed; diff --git a/target/linux/rockchip/patches-5.15/603-net-ethernet-stmmac-add-devname-configuration-from-OF.patch b/target/linux/rockchip/patches-5.15/603-net-ethernet-stmmac-add-devname-configuration-from-OF.patch index 6582a3863a..d18e47e46c 100644 --- a/target/linux/rockchip/patches-5.15/603-net-ethernet-stmmac-add-devname-configuration-from-OF.patch +++ b/target/linux/rockchip/patches-5.15/603-net-ethernet-stmmac-add-devname-configuration-from-OF.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -@@ -7152,6 +7152,7 @@ int stmmac_dvr_probe(struct device *devi +@@ -7134,6 +7134,7 @@ int stmmac_dvr_probe(struct device *devi { struct net_device *ndev = NULL; struct stmmac_priv *priv; @@ -8,7 +8,7 @@ u32 rxq; int i, ret = 0; -@@ -7160,6 +7161,9 @@ int stmmac_dvr_probe(struct device *devi +@@ -7142,6 +7143,9 @@ int stmmac_dvr_probe(struct device *devi if (!ndev) return -ENOMEM; diff --git a/target/linux/rockchip/patches-5.15/701-01-irqchip-gic-v3-its-add-GFP_DMA32-flag-for-memory-allocate.patch b/target/linux/rockchip/patches-5.15/701-01-irqchip-gic-v3-its-add-GFP_DMA32-flag-for-memory-allocate.patch index b2352b8713..6fb01ae0ee 100644 --- a/target/linux/rockchip/patches-5.15/701-01-irqchip-gic-v3-its-add-GFP_DMA32-flag-for-memory-allocate.patch +++ b/target/linux/rockchip/patches-5.15/701-01-irqchip-gic-v3-its-add-GFP_DMA32-flag-for-memory-allocate.patch @@ -83,7 +83,7 @@ Signed-off-by: XiaoDong Huang if (alloc_lpis) { lpi_map = its_lpi_alloc(nvecs, &lpi_base, &nr_lpis); if (lpi_map) -@@ -4991,6 +5007,7 @@ static int __init its_probe_one(struct r +@@ -4995,6 +5011,7 @@ static int __init its_probe_one(struct r u64 baser, tmp, typer; struct page *page; int err; @@ -91,7 +91,7 @@ Signed-off-by: XiaoDong Huang its_base = ioremap(res->start, SZ_64K); if (!its_base) { -@@ -5059,7 +5076,10 @@ static int __init its_probe_one(struct r +@@ -5063,7 +5080,10 @@ static int __init its_probe_one(struct r its->numa_node = numa_node; diff --git a/target/linux/rockchip/patches-5.15/701-02-irqchip-gic-v3-its-force-to-config-its-tables-as.patch b/target/linux/rockchip/patches-5.15/701-02-irqchip-gic-v3-its-force-to-config-its-tables-as.patch index 367aa8674b..d54089e2f6 100644 --- a/target/linux/rockchip/patches-5.15/701-02-irqchip-gic-v3-its-force-to-config-its-tables-as.patch +++ b/target/linux/rockchip/patches-5.15/701-02-irqchip-gic-v3-its-force-to-config-its-tables-as.patch @@ -45,7 +45,7 @@ Signed-off-by: XiaoDong Huang if (!(tmp & GICR_PENDBASER_SHAREABILITY_MASK)) { /* * The HW reports non-shareable, we must remove the -@@ -5110,6 +5122,10 @@ static int __init its_probe_one(struct r +@@ -5114,6 +5126,10 @@ static int __init its_probe_one(struct r gits_write_cbaser(baser, its->base + GITS_CBASER); tmp = gits_read_cbaser(its->base + GITS_CBASER); diff --git a/target/linux/rockchip/patches-5.15/701-04-irqchip-gic-v3-its-force-to-config-its-tables-as.patch b/target/linux/rockchip/patches-5.15/701-04-irqchip-gic-v3-its-force-to-config-its-tables-as.patch index 7bb71471f8..866e9ab001 100644 --- a/target/linux/rockchip/patches-5.15/701-04-irqchip-gic-v3-its-force-to-config-its-tables-as.patch +++ b/target/linux/rockchip/patches-5.15/701-04-irqchip-gic-v3-its-force-to-config-its-tables-as.patch @@ -42,7 +42,7 @@ Change-Id: I7275cbf011061f11968505a7570230d2d789e9fc tmp &= ~GICR_PENDBASER_SHAREABILITY_MASK; if (!(tmp & GICR_PENDBASER_SHAREABILITY_MASK)) { -@@ -5127,7 +5130,8 @@ static int __init its_probe_one(struct r +@@ -5131,7 +5134,8 @@ static int __init its_probe_one(struct r tmp = gits_read_cbaser(its->base + GITS_CBASER); if (of_machine_is_compatible("rockchip,rk3568") ||