diff mbox series

[v2,15/21] mmc: sunxi: Add H616 clock offset

Message ID 20210111201153.1800440-16-jernej.skrabec@siol.net
State Superseded
Delegated to: Andre Przywara
Headers show
Series sunxi: Introduce H616 support | expand

Commit Message

Jernej Škrabec Jan. 11, 2021, 8:11 p.m. UTC
H616 mmc clock is on same address as H6.

Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
---
 drivers/mmc/sunxi_mmc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Jaehoon Chung Jan. 11, 2021, 10:18 p.m. UTC | #1
On 1/12/21 5:11 AM, Jernej Skrabec wrote:
> H616 mmc clock is on same address as H6.
> 
> Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>

Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>

Best Regards,
Jaehoon Chung

> ---
>  drivers/mmc/sunxi_mmc.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
> index d632b2332ca3..8458d154afd8 100644
> --- a/drivers/mmc/sunxi_mmc.c
> +++ b/drivers/mmc/sunxi_mmc.c
> @@ -601,7 +601,8 @@ static unsigned get_mclk_offset(void)
>  	if (IS_ENABLED(CONFIG_MACH_SUN9I_A80))
>  		return 0x410;
>  
> -	if (IS_ENABLED(CONFIG_MACH_SUN50I_H6))
> +	if (IS_ENABLED(CONFIG_MACH_SUN50I_H6) ||
> +	    IS_ENABLED(CONFIG_MACH_SUN50I_H616))
>  		return 0x830;
>  
>  	return 0x88;
>
Andre Przywara Jan. 23, 2021, 1:58 a.m. UTC | #2
On Mon, 11 Jan 2021 21:11:47 +0100
Jernej Skrabec <jernej.skrabec@siol.net> wrote:

> H616 mmc clock is on same address as H6.
> 
> Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
> ---
>  drivers/mmc/sunxi_mmc.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
> index d632b2332ca3..8458d154afd8 100644
> --- a/drivers/mmc/sunxi_mmc.c
> +++ b/drivers/mmc/sunxi_mmc.c
> @@ -601,7 +601,8 @@ static unsigned get_mclk_offset(void)
>  	if (IS_ENABLED(CONFIG_MACH_SUN9I_A80))
>  		return 0x410;
>  
> -	if (IS_ENABLED(CONFIG_MACH_SUN50I_H6))
> +	if (IS_ENABLED(CONFIG_MACH_SUN50I_H6) ||
> +	    IS_ENABLED(CONFIG_MACH_SUN50I_H616))

So this should really be CONFIG_SUN50I_GEN_H6, since this is what this
symbol is about.
I changed this in patch 12/21 ("mmc: sunxi: Refactor mod clock register
offset") now, I just couldn't do this in the initial post because this
symbol wasn't around at this point.

Which mean this patch here becomes redundant, so I will drop it.

Cheers,
Andre

>  		return 0x830;
>  
>  	return 0x88;
diff mbox series

Patch

diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
index d632b2332ca3..8458d154afd8 100644
--- a/drivers/mmc/sunxi_mmc.c
+++ b/drivers/mmc/sunxi_mmc.c
@@ -601,7 +601,8 @@  static unsigned get_mclk_offset(void)
 	if (IS_ENABLED(CONFIG_MACH_SUN9I_A80))
 		return 0x410;
 
-	if (IS_ENABLED(CONFIG_MACH_SUN50I_H6))
+	if (IS_ENABLED(CONFIG_MACH_SUN50I_H6) ||
+	    IS_ENABLED(CONFIG_MACH_SUN50I_H616))
 		return 0x830;
 
 	return 0x88;