evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "mmc: sdhci: Enable CDR for cmdq mode"

Browse source
This commit is contained in:
Linux Build Service Account 2017-07-21 20:15:24 -07:00 • committed by Gerrit - the friendly Code Review server
commit b7cd152c17
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/mmc/host/sdhci-msm.c
View file

@ -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

2
drivers/mmc/host/sdhci.c
View file

@ -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);
}

1
drivers/mmc/host/sdhci.h
View file

@ -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 */