[1/4] sdhci: key 8BITBUS bit off MMC_CAP_8_BIT_DATA

Submitted by Michał Mirosław on Aug. 9, 2017, 8:36 p.m.

Details

Message ID 96ece1eb7b8f6e188e3975f75754aeaf195f3dc0.1502310654.git.mirq-linux@rere.qmqm.pl
State Superseded
Headers show

Commit Message

Michał Mirosław Aug. 9, 2017, 8:36 p.m.
Hosts supporting 8-bit bus are marked accordingly. If MMC_CAP_8_BIT_DATA
is not among host capabilities, 8BITBUS bit will never be set and it
is not cleared in case some non-SDHCI3 host uses it for something else.

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
 drivers/mmc/host/sdhci.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Adrian Hunter Aug. 14, 2017, 11:58 a.m.
On 09/08/17 23:36, Michał Mirosław wrote:
> 
> Hosts supporting 8-bit bus are marked accordingly. If MMC_CAP_8_BIT_DATA
> is not among host capabilities, 8BITBUS bit will never be set and it
> is not cleared in case some non-SDHCI3 host uses it for something else.
> 
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>

Subject should begin "mmc: sdhci: "...

Otherwise:

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

> ---
>  drivers/mmc/host/sdhci.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index ecd0d4350e8a..cca21246cf61 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -1544,10 +1544,9 @@ void sdhci_set_bus_width(struct sdhci_host *host, int width)
>  	ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL);
>  	if (width == MMC_BUS_WIDTH_8) {
>  		ctrl &= ~SDHCI_CTRL_4BITBUS;
> -		if (host->version >= SDHCI_SPEC_300)
> -			ctrl |= SDHCI_CTRL_8BITBUS;
> +		ctrl |= SDHCI_CTRL_8BITBUS;
>  	} else {
> -		if (host->version >= SDHCI_SPEC_300)
> +		if (host->mmc->caps & MMC_CAP_8_BIT_DATA)
>  			ctrl &= ~SDHCI_CTRL_8BITBUS;
>  		if (width == MMC_BUS_WIDTH_4)
>  			ctrl |= SDHCI_CTRL_4BITBUS;
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch hide | download patch | download mbox

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index ecd0d4350e8a..cca21246cf61 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1544,10 +1544,9 @@  void sdhci_set_bus_width(struct sdhci_host *host, int width)
 	ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL);
 	if (width == MMC_BUS_WIDTH_8) {
 		ctrl &= ~SDHCI_CTRL_4BITBUS;
-		if (host->version >= SDHCI_SPEC_300)
-			ctrl |= SDHCI_CTRL_8BITBUS;
+		ctrl |= SDHCI_CTRL_8BITBUS;
 	} else {
-		if (host->version >= SDHCI_SPEC_300)
+		if (host->mmc->caps & MMC_CAP_8_BIT_DATA)
 			ctrl &= ~SDHCI_CTRL_8BITBUS;
 		if (width == MMC_BUS_WIDTH_4)
 			ctrl |= SDHCI_CTRL_4BITBUS;