mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Antony Pavlov <antonynpavlov@gmail.com>
To: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Barebox List <barebox@lists.infradead.org>
Subject: Re: [PATCH 06/12] mci: sdhci: Use Linux defines for SDHCI_HOST_CONTROL register
Date: Wed, 26 Jan 2022 09:32:33 +0300	[thread overview]
Message-ID: <20220126093233.026701eddc2a1a7dceb76849@gmail.com> (raw)
In-Reply-To: <20210607104411.23071-7-s.hauer@pengutronix.de>

On Mon,  7 Jun 2021 12:44:05 +0200
Sascha Hauer <s.hauer@pengutronix.de> wrote:

Hi Sascha!

> To ease porting and comparing of Linux code.
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
>  drivers/mci/arasan-sdhci.c       | 12 ++++++------
>  drivers/mci/atmel-sdhci-common.c | 14 +++++++-------
>  drivers/mci/dove-sdhci.c         | 10 +++++-----
>  drivers/mci/sdhci.h              | 17 ++++++++++++-----
>  4 files changed, 30 insertions(+), 23 deletions(-)
> 
> diff --git a/drivers/mci/arasan-sdhci.c b/drivers/mci/arasan-sdhci.c
> index e22db4cfa3..e02f222345 100644
> --- a/drivers/mci/arasan-sdhci.c
> +++ b/drivers/mci/arasan-sdhci.c

...

> @@ -200,21 +200,21 @@ static void arasan_sdhci_set_ios(struct mci_host *mci, struct mci_ios *ios)
>  	}
>  
>  	val = sdhci_read8(&host->sdhci, SDHCI_HOST_CONTROL) &
> -			~(SDHCI_DATA_WIDTH_4BIT | SDHCI_DATA_WIDTH_8BIT);
> +			~(SDHCI_CTRL_8BITBUS | SDHCI_CTRL_8BITBUS);
>  
>  	switch (ios->bus_width) {
>  	case MMC_BUS_WIDTH_8:
> -		val |= SDHCI_DATA_WIDTH_8BIT;
> +		val |= SDHCI_CTRL_8BITBUS;
>  		break;
>  	case MMC_BUS_WIDTH_4:
                     ^^^^^^^^
> -		val |= SDHCI_DATA_WIDTH_4BIT;
                                  ^^^^^^^^^^^
> +		val |= SDHCI_CTRL_8BITBUS;
                                  ^^^^^^^
Is this correct?

>  		break;
>  	}
>  
>  	if (ios->clock > 26000000)
> -		val |= SDHCI_HIGHSPEED_EN;
> +		val |= SDHCI_CTRL_HISPD;
>  	else
> -		val &= ~SDHCI_HIGHSPEED_EN;
> +		val &= ~SDHCI_CTRL_HISPD;
>  
>  	sdhci_write8(&host->sdhci, SDHCI_HOST_CONTROL, val);
>  }
> diff --git a/drivers/mci/atmel-sdhci-common.c b/drivers/mci/atmel-sdhci-common.c
> index b391775b00..d2b777a93c 100644
> --- a/drivers/mci/atmel-sdhci-common.c
> +++ b/drivers/mci/atmel-sdhci-common.c

...

> @@ -297,15 +297,15 @@ static int at91_sdhci_set_bus_width(struct at91_sdhci *host, unsigned bus_width)
>  
>  	switch(bus_width) {
>  	case MMC_BUS_WIDTH_8:
> -		reg |= SDHCI_DATA_WIDTH_8BIT;
> +		reg |= SDHCI_CTRL_8BITBUS;
>  		break;
>  	case MMC_BUS_WIDTH_4:
                     ^^^^^^^

> -		reg &= ~SDHCI_DATA_WIDTH_8BIT;
> -		reg |= SDHCI_DATA_WIDTH_4BIT;
                                  ^^^^^^^^^^^
> +		reg &= ~SDHCI_CTRL_8BITBUS;
> +		reg |= SDHCI_CTRL_8BITBUS;
                                  ^^^^^^^^

just the same question here

>  		break;
>  	default:
> -		reg &= ~SDHCI_DATA_WIDTH_8BIT;
> -		reg &= ~SDHCI_DATA_WIDTH_4BIT;
> +		reg &= ~SDHCI_CTRL_8BITBUS;
> +		reg &= ~SDHCI_CTRL_8BITBUS;

and here

>  	}
>  
>  	sdhci_write8(sdhci, SDHCI_HOST_CONTROL, reg);
> diff --git a/drivers/mci/dove-sdhci.c b/drivers/mci/dove-sdhci.c
> index 9c10e67eb8..cafc9dc579 100644
> --- a/drivers/mci/dove-sdhci.c
> +++ b/drivers/mci/dove-sdhci.c
> @@ -224,20 +224,20 @@ static void dove_sdhci_mci_set_ios(struct mci_host *mci, struct mci_ios *ios)
>  
>  	/* set bus width */
>  	val = sdhci_read8(&host->sdhci, SDHCI_HOST_CONTROL) &
> -		~(SDHCI_DATA_WIDTH_4BIT | SDHCI_DATA_WIDTH_8BIT);
> +		~(SDHCI_CTRL_8BITBUS | SDHCI_CTRL_8BITBUS);
>  	switch (ios->bus_width) {
>  	case MMC_BUS_WIDTH_8:
> -		val |= SDHCI_DATA_WIDTH_8BIT;
> +		val |= SDHCI_CTRL_8BITBUS;
>  		break;
>  	case MMC_BUS_WIDTH_4:
> -		val |= SDHCI_DATA_WIDTH_4BIT;
> +		val |= SDHCI_CTRL_8BITBUS;

and here

>  		break;
>  	}
>  
>  	if (ios->clock > 26000000)
> -		val |= SDHCI_HIGHSPEED_EN;
> +		val |= SDHCI_CTRL_HISPD;
>  	else
> -		val &= ~SDHCI_HIGHSPEED_EN;
> +		val &= ~SDHCI_CTRL_HISPD;
>  
>  	sdhci_write8(&host->sdhci, SDHCI_HOST_CONTROL, val);
>  

-- 
Best regards,
  Antony Pavlov

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox


  reply	other threads:[~2022-01-26  6:34 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-07 10:43 [PATCH 00/12] SDHCI updates Sascha Hauer
2021-06-07 10:44 ` [PATCH 01/12] mci: sdhci: straighten capabilities register Sascha Hauer
2021-06-07 10:44 ` [PATCH 02/12] mci: sdhci: Add and use SDHCI_CAPABILITIES_1 defines Sascha Hauer
2021-06-07 10:44 ` [PATCH 03/12] mci: sdhci: Use SDHCI_MAX_DIV_SPEC_200 define Sascha Hauer
2021-06-07 10:44 ` [PATCH 04/12] mci: sdhci: port over some common functions from Linux Sascha Hauer
2021-06-07 10:44 ` [PATCH 05/12] mci: sdhci: imx: Use sdhci_setup_host() Sascha Hauer
2021-06-07 10:44 ` [PATCH 06/12] mci: sdhci: Use Linux defines for SDHCI_HOST_CONTROL register Sascha Hauer
2022-01-26  6:32   ` Antony Pavlov [this message]
2022-01-26  9:23     ` Sascha Hauer
2022-01-26 10:13       ` Antony Pavlov
2021-06-07 10:44 ` [PATCH 07/12] mci: sdhci: arasan: Use sdhci_setup_host() Sascha Hauer
2021-06-07 10:44 ` [PATCH 08/12] mci: sdhci: arasan: Use sdhci_set_bus_width() Sascha Hauer
2021-06-07 10:44 ` [PATCH 09/12] mci: sdhci: Use Linux defines for SDHCI_CLOCK_CONTROL register Sascha Hauer
2021-06-07 10:44 ` [PATCH 10/12] mci: sdhci: arasan: Use sdhci_set_clock() Sascha Hauer
2021-06-07 10:44 ` [PATCH 11/12] mci: sdhci: Get rid of many register ops Sascha Hauer
2021-06-07 10:44 ` [PATCH 12/12] mci: Add support for Rockchip variant of the dwcmshc Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220126093233.026701eddc2a1a7dceb76849@gmail.com \
    --to=antonynpavlov@gmail.com \
    --cc=barebox@lists.infradead.org \
    --cc=s.hauer@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox