2019-05-10 03:45:25

by Faiz Abbas

Subject: [PATCH v2 3/3] mmc: sdhci_am654: Fix SLOTTYPE write

In the call to regmap_update_bits() for SLOTTYPE, the mask and value
fields are exchanged. Fix this. This didn't have any affect on the
driver because this was a NOP and it was taking the correct value from
the bootloader.

Cc: stable <[email protected]>
Signed-off-by: Faiz Abbas <[email protected]>
---
drivers/mmc/host/sdhci_am654.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/host/sdhci_am654.c b/drivers/mmc/host/sdhci_am654.c
index 3ff949925127..d0b20780dd0f 100644
--- a/drivers/mmc/host/sdhci_am654.c
+++ b/drivers/mmc/host/sdhci_am654.c
@@ -227,8 +227,8 @@ static int sdhci_am654_init(struct sdhci_host *host)
if (host->mmc->caps & MMC_CAP_NONREMOVABLE)
ctl_cfg_2 = SLOTTYPE_EMBEDDED;

- regmap_update_bits(sdhci_am654->base, CTL_CFG_2, ctl_cfg_2,
- SLOTTYPE_MASK);
+ regmap_update_bits(sdhci_am654->base, CTL_CFG_2, SLOTTYPE_MASK,
+ ctl_cfg_2);

return sdhci_add_host(host);
}
--
2.19.2

2019-05-10 05:59:47

by Adrian Hunter

Subject: Re: [PATCH v2 3/3] mmc: sdhci_am654: Fix SLOTTYPE write

On 10/05/19 6:42 AM, Faiz Abbas wrote:
> In the call to regmap_update_bits() for SLOTTYPE, the mask and value
> fields are exchanged. Fix this. This didn't have any affect on the
> driver because this was a NOP and it was taking the correct value from
> the bootloader.
>
> Cc: stable <[email protected]>

Except that it doesn't apply to stable because of patch 1. Maybe make this
the first patch.

> Signed-off-by: Faiz Abbas <[email protected]>
> ---
> drivers/mmc/host/sdhci_am654.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci_am654.c b/drivers/mmc/host/sdhci_am654.c
> index 3ff949925127..d0b20780dd0f 100644
> --- a/drivers/mmc/host/sdhci_am654.c
> +++ b/drivers/mmc/host/sdhci_am654.c
> @@ -227,8 +227,8 @@ static int sdhci_am654_init(struct sdhci_host *host)
> if (host->mmc->caps & MMC_CAP_NONREMOVABLE)
> ctl_cfg_2 = SLOTTYPE_EMBEDDED;
>
> - regmap_update_bits(sdhci_am654->base, CTL_CFG_2, ctl_cfg_2,
> - SLOTTYPE_MASK);
> + regmap_update_bits(sdhci_am654->base, CTL_CFG_2, SLOTTYPE_MASK,
> + ctl_cfg_2);
>
> return sdhci_add_host(host);
> }
>

2019-05-28 08:33:47

by Faiz Abbas

Subject: Re: [PATCH v2 3/3] mmc: sdhci_am654: Fix SLOTTYPE write

Hi Adrian,

On 10/05/19 11:28 AM, Adrian Hunter wrote:
> On 10/05/19 6:42 AM, Faiz Abbas wrote:
>> In the call to regmap_update_bits() for SLOTTYPE, the mask and value
>> fields are exchanged. Fix this. This didn't have any affect on the
>> driver because this was a NOP and it was taking the correct value from
>> the bootloader.
>>
>> Cc: stable <[email protected]>
>
> Except that it doesn't apply to stable because of patch 1. Maybe make this
> the first patch.
>

Ok. Sending v3 with this as first patch.

Thanks,
Faiz