Commit eea2b5d9 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

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: default avatarUlf Hansson <ulf.hansson@linaro.org>
parents 7eb42da6 8396c793

drivers/mmc/host/dw_mmc.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/mmc/host/sdhci-of-aspeed.c

+1 −0
Original line number Diff line number Diff line
@@ -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		= {