From 12e29aec49bcddc0d5ed5923fa0a701572f6a900 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 17 Nov 2024 21:46:46 +0100 Subject: [PATCH] drop queue-5.15/mmc-sunxi-mmc-fix-a100-compatible-description.patch --- ...-mmc-fix-a100-compatible-description.patch | 57 ------------------- queue-5.15/series | 1 - 2 files changed, 58 deletions(-) delete mode 100644 queue-5.15/mmc-sunxi-mmc-fix-a100-compatible-description.patch diff --git a/queue-5.15/mmc-sunxi-mmc-fix-a100-compatible-description.patch b/queue-5.15/mmc-sunxi-mmc-fix-a100-compatible-description.patch deleted file mode 100644 index d867ff89f39..00000000000 --- a/queue-5.15/mmc-sunxi-mmc-fix-a100-compatible-description.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 85b580afc2c215394e08974bf033de9face94955 Mon Sep 17 00:00:00 2001 -From: Andre Przywara -Date: Thu, 7 Nov 2024 01:42:40 +0000 -Subject: mmc: sunxi-mmc: Fix A100 compatible description - -From: Andre Przywara - -commit 85b580afc2c215394e08974bf033de9face94955 upstream. - -It turns out that the Allwinner A100/A133 SoC only supports 8K DMA -blocks (13 bits wide), for both the SD/SDIO and eMMC instances. -And while this alone would make a trivial fix, the H616 falls back to -the A100 compatible string, so we have to now match the H616 compatible -string explicitly against the description advertising 64K DMA blocks. - -As the A100 is now compatible with the D1 description, let the A100 -compatible string point to that block instead, and introduce an explicit -match against the H616 string, pointing to the old description. -Also remove the redundant setting of clk_delays to NULL on the way. - -Fixes: 3536b82e5853 ("mmc: sunxi: add support for A100 mmc controller") -Cc: stable@vger.kernel.org -Signed-off-by: Andre Przywara -Tested-by: Parthiban Nallathambi -Reviewed-by: Chen-Yu Tsai -Message-ID: <20241107014240.24669-1-andre.przywara@arm.com> -Signed-off-by: Ulf Hansson -Signed-off-by: Greg Kroah-Hartman ---- - drivers/mmc/host/sunxi-mmc.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- a/drivers/mmc/host/sunxi-mmc.c -+++ b/drivers/mmc/host/sunxi-mmc.c -@@ -1183,10 +1183,9 @@ static const struct sunxi_mmc_cfg sun50i - .needs_new_timings = true, - }; - --static const struct sunxi_mmc_cfg sun50i_a100_cfg = { -+static const struct sunxi_mmc_cfg sun50i_h616_cfg = { - .idma_des_size_bits = 16, - .idma_des_shift = 2, -- .clk_delays = NULL, - .can_calibrate = true, - .mask_data0 = true, - .needs_new_timings = true, -@@ -1208,8 +1207,9 @@ static const struct of_device_id sunxi_m - { .compatible = "allwinner,sun9i-a80-mmc", .data = &sun9i_a80_cfg }, - { .compatible = "allwinner,sun50i-a64-mmc", .data = &sun50i_a64_cfg }, - { .compatible = "allwinner,sun50i-a64-emmc", .data = &sun50i_a64_emmc_cfg }, -- { .compatible = "allwinner,sun50i-a100-mmc", .data = &sun50i_a100_cfg }, -+ { .compatible = "allwinner,sun50i-a100-mmc", .data = &sun20i_d1_cfg }, - { .compatible = "allwinner,sun50i-a100-emmc", .data = &sun50i_a100_emmc_cfg }, -+ { .compatible = "allwinner,sun50i-h616-mmc", .data = &sun50i_h616_cfg }, - { /* sentinel */ } - }; - MODULE_DEVICE_TABLE(of, sunxi_mmc_of_match); diff --git a/queue-5.15/series b/queue-5.15/series index fd2cdf256c5..a3bea3d8ca0 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -15,5 +15,4 @@ nilfs2-fix-null-ptr-deref-in-block_touch_buffer-tracepoint.patch ocfs2-fix-ubsan-warning-in-ocfs2_verify_volume.patch nilfs2-fix-null-ptr-deref-in-block_dirty_buffer-tracepoint.patch revert-mmc-dw_mmc-fix-idmac-operation-with-pages-bigger-than-4k.patch -mmc-sunxi-mmc-fix-a100-compatible-description.patch drm-bridge-tc358768-fix-dsi-command-tx.patch -- 2.47.2