Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'mmc-v6.12-rc3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
Pull MMC host fixes from Ulf Hansson:
- dw_mmc: Revert fix for IDMAC operation with pages bigger than 4K
- sunxi-mmc: Fix A100 compatible description
* tag 'mmc-v6.12-rc3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
Revert "mmc: dw_mmc: Fix IDMAC operation with pages bigger than 4K"
mmc: sunxi-mmc: Fix A100 compatible description
+5
-5
+2
-2
drivers/mmc/host/dw_mmc.c
+2
-2
drivers/mmc/host/dw_mmc.c
···
2957
2957
if (host->use_dma == TRANS_MODE_IDMAC) {
2958
2958
mmc->max_segs = host->ring_size;
2959
2959
mmc->max_blk_size = 65535;
2960
-
mmc->max_req_size = DW_MCI_DESC_DATA_LENGTH * host->ring_size;
2961
-
mmc->max_seg_size = mmc->max_req_size;
2960
+
mmc->max_seg_size = 0x1000;
2961
+
mmc->max_req_size = mmc->max_seg_size * host->ring_size;
2962
2962
mmc->max_blk_count = mmc->max_req_size / 512;
2963
2963
} else if (host->use_dma == TRANS_MODE_EDMAC) {
2964
2964
mmc->max_segs = 64;
+3
-3
drivers/mmc/host/sunxi-mmc.c
+3
-3
drivers/mmc/host/sunxi-mmc.c
···
1191
1191
.needs_new_timings = true,
1192
1192
};
1193
1193
1194
-
static const struct sunxi_mmc_cfg sun50i_a100_cfg = {
1194
+
static const struct sunxi_mmc_cfg sun50i_h616_cfg = {
1195
1195
.idma_des_size_bits = 16,
1196
1196
.idma_des_shift = 2,
1197
-
.clk_delays = NULL,
1198
1197
.can_calibrate = true,
1199
1198
.mask_data0 = true,
1200
1199
.needs_new_timings = true,
···
1216
1217
{ .compatible = "allwinner,sun20i-d1-mmc", .data = &sun20i_d1_cfg },
1217
1218
{ .compatible = "allwinner,sun50i-a64-mmc", .data = &sun50i_a64_cfg },
1218
1219
{ .compatible = "allwinner,sun50i-a64-emmc", .data = &sun50i_a64_emmc_cfg },
1219
-
{ .compatible = "allwinner,sun50i-a100-mmc", .data = &sun50i_a100_cfg },
1220
+
{ .compatible = "allwinner,sun50i-a100-mmc", .data = &sun20i_d1_cfg },
1220
1221
{ .compatible = "allwinner,sun50i-a100-emmc", .data = &sun50i_a100_emmc_cfg },
1222
+
{ .compatible = "allwinner,sun50i-h616-mmc", .data = &sun50i_h616_cfg },
1221
1223
{ /* sentinel */ }
1222
1224
};
1223
1225
MODULE_DEVICE_TABLE(of, sunxi_mmc_of_match);