[PATCH] ARM: i.MX8MP: move SCTR enabling into imx8mp_cpu_lowlevel_init

[PATCH] ARM: i.MX8MP: move SCTR enabling into imx8mp_cpu_lowlevel_init

[Ahmad Fatoum]

We already do this SCTR poking in imx8mm_cpu_lowlevel_init. If the EVK
needs it, other boards should as well, thus move it to a more generic
place.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 arch/arm/boards/nxp-imx8mp-evk/lowlevel.c | 5 -----
 arch/arm/mach-imx/cpu_init.c              | 4 +---
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/arch/arm/boards/nxp-imx8mp-evk/lowlevel.c b/arch/arm/boards/nxp-imx8mp-evk/lowlevel.c
index 3298ded5866d..6cb109ae1675 100644
--- a/arch/arm/boards/nxp-imx8mp-evk/lowlevel.c
+++ b/arch/arm/boards/nxp-imx8mp-evk/lowlevel.c
@@ -179,11 +179,6 @@ static __noreturn noinline void nxp_imx8mp_evk_start(void)
 
 ENTRY_FUNCTION(start_nxp_imx8mp_evk, r0, r1, r2)
 {
-	void __iomem *ccm = IOMEM(MX8M_CCM_BASE_ADDR);
-
-	writel(IMX8M_CCM_CCGR_SETTINGn_NEEDED(0),
-	       ccm + IMX8M_CCM_CCGRn_SET(IMX8M_CCM_CCGR_SCTR));
-
 	imx8mp_cpu_lowlevel_init();
 
 	relocate_to_current_adr();
diff --git a/arch/arm/mach-imx/cpu_init.c b/arch/arm/mach-imx/cpu_init.c
index a034b5a9a500..ea1c67469122 100644
--- a/arch/arm/mach-imx/cpu_init.c
+++ b/arch/arm/mach-imx/cpu_init.c
@@ -76,9 +76,7 @@ void imx8mm_cpu_lowlevel_init(void)
 }
 
 void imx8mp_cpu_lowlevel_init(void)
-{
-	imx8m_cpu_lowlevel_init();
-}
+	__alias(imx8mm_cpu_lowlevel_init);
 
 void imx8mq_cpu_lowlevel_init(void)
 {
-- 
2.30.2


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

Re: [PATCH] ARM: i.MX8MP: move SCTR enabling into imx8mp_cpu_lowlevel_init

[Sascha Hauer]

On Mon, Aug 30, 2021 at 01:53:25PM +0200, Ahmad Fatoum wrote:
> We already do this SCTR poking in imx8mm_cpu_lowlevel_init. If the EVK
> needs it, other boards should as well, thus move it to a more generic
> place.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  arch/arm/boards/nxp-imx8mp-evk/lowlevel.c | 5 -----
>  arch/arm/mach-imx/cpu_init.c              | 4 +---
>  2 files changed, 1 insertion(+), 8 deletions(-)

Applied, thanks

Sascha

> 
> diff --git a/arch/arm/boards/nxp-imx8mp-evk/lowlevel.c b/arch/arm/boards/nxp-imx8mp-evk/lowlevel.c
> index 3298ded5866d..6cb109ae1675 100644
> --- a/arch/arm/boards/nxp-imx8mp-evk/lowlevel.c
> +++ b/arch/arm/boards/nxp-imx8mp-evk/lowlevel.c
> @@ -179,11 +179,6 @@ static __noreturn noinline void nxp_imx8mp_evk_start(void)
>  
>  ENTRY_FUNCTION(start_nxp_imx8mp_evk, r0, r1, r2)
>  {
> -	void __iomem *ccm = IOMEM(MX8M_CCM_BASE_ADDR);
> -
> -	writel(IMX8M_CCM_CCGR_SETTINGn_NEEDED(0),
> -	       ccm + IMX8M_CCM_CCGRn_SET(IMX8M_CCM_CCGR_SCTR));
> -
>  	imx8mp_cpu_lowlevel_init();
>  
>  	relocate_to_current_adr();
> diff --git a/arch/arm/mach-imx/cpu_init.c b/arch/arm/mach-imx/cpu_init.c
> index a034b5a9a500..ea1c67469122 100644
> --- a/arch/arm/mach-imx/cpu_init.c
> +++ b/arch/arm/mach-imx/cpu_init.c
> @@ -76,9 +76,7 @@ void imx8mm_cpu_lowlevel_init(void)
>  }
>  
>  void imx8mp_cpu_lowlevel_init(void)
> -{
> -	imx8m_cpu_lowlevel_init();
> -}
> +	__alias(imx8mm_cpu_lowlevel_init);
>  
>  void imx8mq_cpu_lowlevel_init(void)
>  {
> -- 
> 2.30.2
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

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