Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a7d73cb authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mmc: sdhci-msm: Setting coherent_dma_mask"

parents fdb87603 1656e0fa

drivers/mmc/host/sdhci-msm.c

+2 −0
Original line number Diff line number Diff line
@@ -3358,9 +3358,11 @@ static int sdhci_msm_probe(struct platform_device *pdev) 
		(dma_supported(mmc_dev(host->mmc), DMA_BIT_MASK(64)))) {

		host->dma_mask = DMA_BIT_MASK(64);

		mmc_dev(host->mmc)->dma_mask = &host->dma_mask;

		mmc_dev(host->mmc)->coherent_dma_mask  = host->dma_mask;

	} else if (dma_supported(mmc_dev(host->mmc), DMA_BIT_MASK(32))) {

		host->dma_mask = DMA_BIT_MASK(32);

		mmc_dev(host->mmc)->dma_mask = &host->dma_mask;

		mmc_dev(host->mmc)->coherent_dma_mask  = host->dma_mask;

	} else {

		dev_err(&pdev->dev, "%s: Failed to set dma mask\n", __func__);

	}

include/linux/mmc/sdhci.h

+1 −0
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ struct sdhci_host { 
	/* Internal data */

	struct mmc_host *mmc;	/* MMC structure */

	u64 dma_mask;		/* custom DMA mask */

	u64 coherent_dma_mask;



#if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE)

	struct led_classdev led;	/* LED control */