On Fri, 18 Jan 2019 at 07:04, Ernest Zhang(WH)
<ernest.zhang@xxxxxxxxxxxxxx> wrote:
>
> O2 SD host controller only need set the quirk2 flag
> SDHCI_QUIRK2_CLEAR_TRANSFERMODE_REG_BEFORE_CMD when
> work on force 1.8v emmc mode but not normal mode
>
> Signed-off-by: Ernest Zhang <ernest.zhang@xxxxxxxxxxxxxx>
Applied for next, thanks!
Kind regards
Uffe
> ---
> drivers/mmc/host/sdhci-pci-o2micro.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/sdhci-pci-o2micro.c b/drivers/mmc/host/sdhci-pci-o2micro.c
> index 7f11cee7..05a012a6 100644
> --- a/drivers/mmc/host/sdhci-pci-o2micro.c
> +++ b/drivers/mmc/host/sdhci-pci-o2micro.c
> @@ -428,6 +428,7 @@ int sdhci_pci_o2_probe_slot(struct sdhci_pci_slot *slot)
> mmc_hostname(host->mmc));
> host->flags &= ~SDHCI_SIGNALING_330;
> host->flags |= SDHCI_SIGNALING_180;
> + host->quirks2 |= SDHCI_QUIRK2_CLEAR_TRANSFERMODE_REG_BEFORE_CMD;
> host->mmc->caps2 |= MMC_CAP2_NO_SD;
> host->mmc->caps2 |= MMC_CAP2_NO_SDIO;
> pci_write_config_dword(chip->pdev,
> @@ -677,7 +678,6 @@ static const struct sdhci_ops sdhci_pci_o2_ops = {
> const struct sdhci_pci_fixes sdhci_o2 = {
> .probe = sdhci_pci_o2_probe,
> .quirks = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC,
> - .quirks2 = SDHCI_QUIRK2_CLEAR_TRANSFERMODE_REG_BEFORE_CMD,
> .probe_slot = sdhci_pci_o2_probe_slot,
> #ifdef CONFIG_PM_SLEEP
> .resume = sdhci_pci_o2_resume,
> --
> 2.20.1
>
