diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2024-08-28 17:21:31 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2024-08-28 17:21:31 +0200 |
| commit | eea2b5d9bc41478796b3e8dd3c9a16b49671d36c (patch) | |
| tree | 40a1d59c6b2e2fc9598a6a750fc5f341a5cd37b5 /drivers/mmc/host | |
| parent | mmc: sdhci-of-dwcmshc: Add hw_reset() support for BlueField-3 SoC (diff) | |
| parent | mmc: dw_mmc: Fix IDMAC operation with pages bigger than 4K (diff) | |
| download | linux-eea2b5d9bc41478796b3e8dd3c9a16b49671d36c.tar.xz linux-eea2b5d9bc41478796b3e8dd3c9a16b49671d36c.zip | |
mmc: Merge branch fixes into next
Merge the mmc fixes for v6.11-rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v6.12.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/host')
| -rw-r--r-- | drivers/mmc/host/dw_mmc.c | 4 | ||||
| -rw-r--r-- | drivers/mmc/host/sdhci-of-aspeed.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index e9f6e4e62290..41e451235f63 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2957,8 +2957,8 @@ static int dw_mci_init_slot(struct dw_mci *host) if (host->use_dma == TRANS_MODE_IDMAC) { mmc->max_segs = host->ring_size; mmc->max_blk_size = 65535; - mmc->max_seg_size = 0x1000; - mmc->max_req_size = mmc->max_seg_size * host->ring_size; + mmc->max_req_size = DW_MCI_DESC_DATA_LENGTH * host->ring_size; + mmc->max_seg_size = mmc->max_req_size; mmc->max_blk_count = mmc->max_req_size / 512; } else if (host->use_dma == TRANS_MODE_EDMAC) { mmc->max_segs = 64; diff --git a/drivers/mmc/host/sdhci-of-aspeed.c b/drivers/mmc/host/sdhci-of-aspeed.c index 430c1f90037b..37240895ffaa 100644 --- a/drivers/mmc/host/sdhci-of-aspeed.c +++ b/drivers/mmc/host/sdhci-of-aspeed.c @@ -510,6 +510,7 @@ static const struct of_device_id aspeed_sdhci_of_match[] = { { .compatible = "aspeed,ast2600-sdhci", .data = &ast2600_sdhci_pdata, }, { } }; +MODULE_DEVICE_TABLE(of, aspeed_sdhci_of_match); static struct platform_driver aspeed_sdhci_driver = { .driver = { |