diff mbox series

[V1] mmc: sdhci: Fix sdhci_do_enable_v4_mode

Message ID 1544733246-11678-1-git-send-email-skomatineni@nvidia.com
State Changes Requested
Headers show
Series [V1] mmc: sdhci: Fix sdhci_do_enable_v4_mode | expand

Commit Message

Sowjanya Komatineni Dec. 13, 2018, 8:34 p.m. UTC
V4_MODE is Bit-15 of SDHCI_HOST_CONTROL2 register.
Need to perform word access to this register.

Signed-off-by: Sowjanya Komatineni <skomatineni@nvidia.com>
---
 drivers/mmc/host/sdhci.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Adrian Hunter Dec. 14, 2018, 7:34 a.m. UTC | #1
On 13/12/18 10:34 PM, Sowjanya Komatineni wrote:
> V4_MODE is Bit-15 of SDHCI_HOST_CONTROL2 register.
> Need to perform word access to this register.
> 
> Signed-off-by: Sowjanya Komatineni <skomatineni@nvidia.com>

Fixes: b3f80b434f726 ("mmc: sdhci: Add sd host v4 mode")

Acked-by: Adrian Hunter <adrian.hunter@intel.com>

> ---
>  drivers/mmc/host/sdhci.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index 99bdae53fa2e..fde984d10619 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -127,12 +127,12 @@ static void sdhci_do_enable_v4_mode(struct sdhci_host *host)
>  {
>  	u16 ctrl2;
>  
> -	ctrl2 = sdhci_readb(host, SDHCI_HOST_CONTROL2);
> +	ctrl2 = sdhci_readw(host, SDHCI_HOST_CONTROL2);
>  	if (ctrl2 & SDHCI_CTRL_V4_MODE)
>  		return;
>  
>  	ctrl2 |= SDHCI_CTRL_V4_MODE;
> -	sdhci_writeb(host, ctrl2, SDHCI_HOST_CONTROL);
> +	sdhci_writew(host, ctrl2, SDHCI_HOST_CONTROL2);
>  }
>  
>  /*
>
Ulf Hansson Dec. 17, 2018, 8:07 a.m. UTC | #2
On Thu, 13 Dec 2018 at 21:34, Sowjanya Komatineni
<skomatineni@nvidia.com> wrote:
>
> V4_MODE is Bit-15 of SDHCI_HOST_CONTROL2 register.
> Need to perform word access to this register.
>
> Signed-off-by: Sowjanya Komatineni <skomatineni@nvidia.com>

Applied for fixes, thanks!

Kind regards
Uffe


> ---
>  drivers/mmc/host/sdhci.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index 99bdae53fa2e..fde984d10619 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -127,12 +127,12 @@ static void sdhci_do_enable_v4_mode(struct sdhci_host *host)
>  {
>         u16 ctrl2;
>
> -       ctrl2 = sdhci_readb(host, SDHCI_HOST_CONTROL2);
> +       ctrl2 = sdhci_readw(host, SDHCI_HOST_CONTROL2);
>         if (ctrl2 & SDHCI_CTRL_V4_MODE)
>                 return;
>
>         ctrl2 |= SDHCI_CTRL_V4_MODE;
> -       sdhci_writeb(host, ctrl2, SDHCI_HOST_CONTROL);
> +       sdhci_writew(host, ctrl2, SDHCI_HOST_CONTROL2);
>  }
>
>  /*
> --
> 2.7.4
>
diff mbox series

Patch

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 99bdae53fa2e..fde984d10619 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -127,12 +127,12 @@  static void sdhci_do_enable_v4_mode(struct sdhci_host *host)
 {
 	u16 ctrl2;
 
-	ctrl2 = sdhci_readb(host, SDHCI_HOST_CONTROL2);
+	ctrl2 = sdhci_readw(host, SDHCI_HOST_CONTROL2);
 	if (ctrl2 & SDHCI_CTRL_V4_MODE)
 		return;
 
 	ctrl2 |= SDHCI_CTRL_V4_MODE;
-	sdhci_writeb(host, ctrl2, SDHCI_HOST_CONTROL);
+	sdhci_writew(host, ctrl2, SDHCI_HOST_CONTROL2);
 }
 
 /*