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

Commit b7cd152c 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: Enable CDR for cmdq mode"

parents 7d24b9b4 cc705faa

drivers/mmc/host/sdhci-msm.c

+3 −1
Original line number Diff line number Diff line
@@ -4179,8 +4179,10 @@ static void sdhci_set_default_hw_caps(struct sdhci_msm_host *msm_host, 
	/* keep track of the value in SDHCI_CAPABILITIES */

	msm_host->caps_0 = caps;



	if ((major == 1) && (minor >= 0x6b))

	if ((major == 1) && (minor >= 0x6b)) {

		msm_host->ice_hci_support = true;

		host->cdr_support = true;

	}

}



#ifdef CONFIG_MMC_CQ_HCI

drivers/mmc/host/sdhci.c

+1 −1
Original line number Diff line number Diff line
@@ -3633,7 +3633,7 @@ static void sdhci_cmdq_set_transfer_params(struct mmc_host *mmc) 
			ctrl |= SDHCI_CTRL_ADMA32;

		sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL);

	}

	if (host->ops->toggle_cdr)

	if (host->ops->toggle_cdr && !host->cdr_support)

		host->ops->toggle_cdr(host, false);

}

drivers/mmc/host/sdhci.h

+1 −0
Original line number Diff line number Diff line
@@ -564,6 +564,7 @@ struct sdhci_host { 
	bool runtime_suspended;	/* Host is runtime suspended */

	bool bus_on;		/* Bus power prevents runtime suspend */

	bool preset_enabled;	/* Preset is enabled */

	bool cdr_support;



	struct mmc_request *mrq;	/* Current request */

	struct mmc_command *cmd;	/* Current command */