* [PATCH v2] mmc: sdhci: fix driver type B and D handling in sdhci_do_set_ios()
@ 2015-05-20 21:35 Petri Gynther
2015-05-22 13:47 ` Ulf Hansson
0 siblings, 1 reply; 2+ messages in thread
From: Petri Gynther @ 2015-05-20 21:35 UTC (permalink / raw)
To: linux-mmc; +Cc: ulf.hansson
sdhci_do_set_ios() doesn't currently program SDHCI_HOST_CONTROL2
register correctly when host->preset_enabled == false.
Add code to handle the missing cases MMC_SET_DRIVER_TYPE_B and
MMC_SET_DRIVER_TYPE_D.
Signed-off-by: Petri Gynther <pgynther@google.com>
---
drivers/mmc/host/sdhci.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index c80287a..5d32a00 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1562,8 +1562,17 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios)
ctrl_2 &= ~SDHCI_CTRL_DRV_TYPE_MASK;
if (ios->drv_type == MMC_SET_DRIVER_TYPE_A)
ctrl_2 |= SDHCI_CTRL_DRV_TYPE_A;
+ else if (ios->drv_type == MMC_SET_DRIVER_TYPE_B)
+ ctrl_2 |= SDHCI_CTRL_DRV_TYPE_B;
else if (ios->drv_type == MMC_SET_DRIVER_TYPE_C)
ctrl_2 |= SDHCI_CTRL_DRV_TYPE_C;
+ else if (ios->drv_type == MMC_SET_DRIVER_TYPE_D)
+ ctrl_2 |= SDHCI_CTRL_DRV_TYPE_D;
+ else {
+ pr_warn("%s: invalid driver type, default to "
+ "driver type B\n", mmc_hostname(mmc));
+ ctrl_2 |= SDHCI_CTRL_DRV_TYPE_B;
+ }
sdhci_writew(host, ctrl_2, SDHCI_HOST_CONTROL2);
} else {
--
2.2.0.rc0.207.ga3a616c
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] mmc: sdhci: fix driver type B and D handling in sdhci_do_set_ios()
2015-05-20 21:35 [PATCH v2] mmc: sdhci: fix driver type B and D handling in sdhci_do_set_ios() Petri Gynther
@ 2015-05-22 13:47 ` Ulf Hansson
0 siblings, 0 replies; 2+ messages in thread
From: Ulf Hansson @ 2015-05-22 13:47 UTC (permalink / raw)
To: Petri Gynther; +Cc: linux-mmc
On 20 May 2015 at 23:35, Petri Gynther <pgynther@google.com> wrote:
> sdhci_do_set_ios() doesn't currently program SDHCI_HOST_CONTROL2
> register correctly when host->preset_enabled == false.
>
> Add code to handle the missing cases MMC_SET_DRIVER_TYPE_B and
> MMC_SET_DRIVER_TYPE_D.
>
> Signed-off-by: Petri Gynther <pgynther@google.com>
Thanks, applied.
Kind regards
Uffe
> ---
> drivers/mmc/host/sdhci.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index c80287a..5d32a00 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -1562,8 +1562,17 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios)
> ctrl_2 &= ~SDHCI_CTRL_DRV_TYPE_MASK;
> if (ios->drv_type == MMC_SET_DRIVER_TYPE_A)
> ctrl_2 |= SDHCI_CTRL_DRV_TYPE_A;
> + else if (ios->drv_type == MMC_SET_DRIVER_TYPE_B)
> + ctrl_2 |= SDHCI_CTRL_DRV_TYPE_B;
> else if (ios->drv_type == MMC_SET_DRIVER_TYPE_C)
> ctrl_2 |= SDHCI_CTRL_DRV_TYPE_C;
> + else if (ios->drv_type == MMC_SET_DRIVER_TYPE_D)
> + ctrl_2 |= SDHCI_CTRL_DRV_TYPE_D;
> + else {
> + pr_warn("%s: invalid driver type, default to "
> + "driver type B\n", mmc_hostname(mmc));
> + ctrl_2 |= SDHCI_CTRL_DRV_TYPE_B;
> + }
>
> sdhci_writew(host, ctrl_2, SDHCI_HOST_CONTROL2);
> } else {
> --
> 2.2.0.rc0.207.ga3a616c
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-05-22 13:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-05-20 21:35 [PATCH v2] mmc: sdhci: fix driver type B and D handling in sdhci_do_set_ios() Petri Gynther
2015-05-22 13:47 ` Ulf Hansson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.