[v5,2/2] mmc: renesas-sdhi: Add R8A774A1 SDHI quirks

Message ID	20201008085941.3600-2-biju.das.jz@bp.renesas.com
State	Superseded
Delegated to:	Marek Vasut
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: Biju Das <biju.das.jz@bp.renesas.com> To: Peng Fan <peng.fan@nxp.com> Cc: Biju Das <biju.das.jz@bp.renesas.com>, u-boot@lists.denx.de, Marek Vasut <marek.vasut+renesas@gmail.com>, Nobuhiro Iwamatsu <iwamatsu@nigauri.org>, Chris Paterson <Chris.Paterson2@renesas.com>, Prabhakar Mahadev Lad <prabhakar.mahadev-lad.rj@bp.renesas.com> Subject: [PATCH v5 2/2] mmc: renesas-sdhi: Add R8A774A1 SDHI quirks Date: Thu, 8 Oct 2020 09:59:41 +0100 Message-Id: <20201008085941.3600-2-biju.das.jz@bp.renesas.com> In-Reply-To: <20201008085941.3600-1-biju.das.jz@bp.renesas.com> References: <20201008085941.3600-1-biju.das.jz@bp.renesas.com> Precedence: list Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	[v5,1/2] arm: rmobile: Add RZ/G2[HMNE] SoC support \| expand [v5,1/2] arm: rmobile: Add RZ/G2[HMNE] SoC support [v5,2/2] mmc: renesas-sdhi: Add R8A774A1 SDHI quirks

Message ID

20201008085941.3600-2-biju.das.jz@bp.renesas.com

State

Superseded

Delegated to:

Marek Vasut

Headers

From: Biju Das <biju.das.jz@bp.renesas.com>
To: Peng Fan <peng.fan@nxp.com>
Cc: Biju Das <biju.das.jz@bp.renesas.com>, u-boot@lists.denx.de,
 Marek Vasut <marek.vasut+renesas@gmail.com>,
 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>,
 Chris Paterson <Chris.Paterson2@renesas.com>,
 Prabhakar Mahadev Lad <prabhakar.mahadev-lad.rj@bp.renesas.com>
Subject: [PATCH v5 2/2] mmc: renesas-sdhi: Add R8A774A1 SDHI quirks
Date: Thu,  8 Oct 2020 09:59:41 +0100
Message-Id: <20201008085941.3600-2-biju.das.jz@bp.renesas.com>
In-Reply-To: <20201008085941.3600-1-biju.das.jz@bp.renesas.com>
References: <20201008085941.3600-1-biju.das.jz@bp.renesas.com>
Precedence: list
Errors-To: u-boot-bounces@lists.denx.de
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

Series

[v5,1/2] arm: rmobile: Add RZ/G2[HMNE] SoC support | expand

Commit Message

Biju Das Oct. 8, 2020, 8:59 a.m. UTC

Add various SDHI quirks for R8A774A1 SoC.

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
---
 v5 : New Patch
---
 drivers/mmc/renesas-sdhi.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

Comments

Marek Vasut Oct. 25, 2020, 3:50 p.m. UTC | #1

On 10/8/20 10:59 AM, Biju Das wrote:
> Add various SDHI quirks for R8A774A1 SoC.
> 
> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
> ---
>  v5 : New Patch
> ---
>  drivers/mmc/renesas-sdhi.c | 18 ++++++++++++------
>  1 file changed, 12 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/mmc/renesas-sdhi.c b/drivers/mmc/renesas-sdhi.c
> index d80b3fc28f..40e01ed890 100644
> --- a/drivers/mmc/renesas-sdhi.c
> +++ b/drivers/mmc/renesas-sdhi.c
> @@ -870,7 +870,8 @@ static void renesas_sdhi_filter_caps(struct udevice *dev)
>  	/* HS400 is not supported on H3 ES1.x and M3W ES1.0, ES1.1 */
>  	if (((rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A7795) &&
>  	    (rmobile_get_cpu_rev_integer() <= 1)) ||
> -	    ((rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A7796) &&
> +	    (((rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A7796) ||
> +	    (rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A774A1)) &&

Hmm ... this code is growing real complex.

Would it be too hard to add soc_device_attribute (see Linux) to U-Boot
and clean that code above up ? Or maybe there is already something
similar in U-Boot to match on SoC revision ?

Biju Das Nov. 1, 2020, 7:28 p.m. UTC | #2

Hi Marek,

> Subject: Re: [PATCH v5 2/2] mmc: renesas-sdhi: Add R8A774A1 SDHI quirks
> 
> On 10/8/20 10:59 AM, Biju Das wrote:
> > Add various SDHI quirks for R8A774A1 SoC.
> >
> > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> > Reviewed-by: Lad Prabhakar <prabhakar.mahadev-
> lad.rj@bp.renesas.com>
> > ---
> >  v5 : New Patch
> > ---
> >  drivers/mmc/renesas-sdhi.c | 18 ++++++++++++------
> >  1 file changed, 12 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/mmc/renesas-sdhi.c b/drivers/mmc/renesas-sdhi.c
> > index d80b3fc28f..40e01ed890 100644
> > --- a/drivers/mmc/renesas-sdhi.c
> > +++ b/drivers/mmc/renesas-sdhi.c
> > @@ -870,7 +870,8 @@ static void renesas_sdhi_filter_caps(struct udevice
> *dev)
> >  	/* HS400 is not supported on H3 ES1.x and M3W ES1.0, ES1.1 */
> >  	if (((rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A7795) &&
> >  	    (rmobile_get_cpu_rev_integer() <= 1)) ||
> > -	    ((rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A7796) &&
> > +	    (((rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A7796) ||
> > +	    (rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A774A1)) &&
> 
> Hmm ... this code is growing real complex.
> 
> Would it be too hard to add soc_device_attribute (see Linux) to U-Boot and
> clean that code above up ? Or maybe there is already something similar in U-
> Boot to match on SoC revision ?

OK, Agreed. will use soc_device_match to add quirks.

Regards,
Biju

diff --git a/drivers/mmc/renesas-sdhi.c b/drivers/mmc/renesas-sdhi.c
index d80b3fc28f..40e01ed890 100644
--- a/drivers/mmc/renesas-sdhi.c
+++ b/drivers/mmc/renesas-sdhi.c
@@ -870,7 +870,8 @@  static void renesas_sdhi_filter_caps(struct udevice *dev)
 	/* HS400 is not supported on H3 ES1.x and M3W ES1.0, ES1.1 */
 	if (((rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A7795) &&
 	    (rmobile_get_cpu_rev_integer() <= 1)) ||
-	    ((rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A7796) &&
+	    (((rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A7796) ||
+	    (rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A774A1)) &&
 	    (rmobile_get_cpu_rev_integer() == 1) &&
 	    (rmobile_get_cpu_rev_fraction() < 2)))
 		plat->cfg.host_caps &= ~MMC_MODE_HS400;
@@ -878,7 +879,8 @@  static void renesas_sdhi_filter_caps(struct udevice *dev)
 	/* H3 ES2.0, ES3.0 and M3W ES1.2 and M3N bad taps */
 	if (((rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A7795) &&
 	    (rmobile_get_cpu_rev_integer() >= 2)) ||
-	    ((rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A7796) &&
+	    (((rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A7796) ||
+	    (rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A774A1)) &&
 	    (rmobile_get_cpu_rev_integer() == 1) &&
 	    (rmobile_get_cpu_rev_fraction() == 2)) ||
 	    (rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A77965))
@@ -894,7 +896,8 @@  static void renesas_sdhi_filter_caps(struct udevice *dev)
 	}
 
 	/* M3W ES1.2 can use HS400 with manual adjustment */
-	if ((rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A7796) &&
+	if (((rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A7796) ||
+	     (rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A774A1)) &&
 	    (rmobile_get_cpu_rev_integer() == 1) &&
 	    (rmobile_get_cpu_rev_fraction() == 2)) {
 		priv->adjust_hs400_enable = true;
@@ -904,7 +907,8 @@  static void renesas_sdhi_filter_caps(struct udevice *dev)
 	}
 
 	/* M3W ES1.x for x>2 can use HS400 with manual adjustment and taps */
-	if ((rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A7796) &&
+	if (((rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A7796) ||
+	     (rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A774A1)) &&
 	    (rmobile_get_cpu_rev_integer() == 1) &&
 	    (rmobile_get_cpu_rev_fraction() > 2)) {
 		priv->adjust_hs400_enable = true;
@@ -933,7 +937,8 @@  static void renesas_sdhi_filter_caps(struct udevice *dev)
 	/* H3 ES1.x, ES2.0 and M3W ES1.0, ES1.1, ES1.2 uses 4 tuning taps */
 	if (((rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A7795) &&
 	    (rmobile_get_cpu_rev_integer() <= 2)) ||
-	    ((rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A7796) &&
+	    (((rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A7796) ||
+	    (rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A774A1)) &&
 	    (rmobile_get_cpu_rev_integer() == 1) &&
 	    (rmobile_get_cpu_rev_fraction() <= 2)))
 		priv->nrtaps = 4;
@@ -943,7 +948,8 @@  static void renesas_sdhi_filter_caps(struct udevice *dev)
 	/* H3 ES1.x and M3W ES1.0 uses bit 17 for DTRAEND */
 	if (((rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A7795) &&
 	    (rmobile_get_cpu_rev_integer() <= 1)) ||
-	    ((rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A7796) &&
+	    (((rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A7796) ||
+	    (rmobile_get_cpu_type() == RMOBILE_CPU_TYPE_R8A774A1)) &&
 	    (rmobile_get_cpu_rev_integer() == 1) &&
 	    (rmobile_get_cpu_rev_fraction() == 0)))
 		priv->read_poll_flag = TMIO_SD_DMA_INFO1_END_RD;