* [PATCH 1/2] ARM: i.MX8MM: fix sparse warnings in early clock code
@ 2021-01-29 15:25 Ahmad Fatoum
2021-01-29 15:25 ` [PATCH 2/2] ARM: i.MX8MM: move system counter enabling into imx8mm_cpu_lowlevel_init Ahmad Fatoum
2021-02-01 8:45 ` [PATCH 1/2] ARM: i.MX8MM: fix sparse warnings in early clock code Sascha Hauer
0 siblings, 2 replies; 3+ messages in thread
From: Ahmad Fatoum @ 2021-01-29 15:25 UTC (permalink / raw)
To: barebox; +Cc: Ahmad Fatoum
Some __iomem markers were being casted away. Fix that.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
arch/arm/mach-imx/imx8m.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-imx/imx8m.c b/arch/arm/mach-imx/imx8m.c
index b9e01a1d1854..350d203539fc 100644
--- a/arch/arm/mach-imx/imx8m.c
+++ b/arch/arm/mach-imx/imx8m.c
@@ -35,14 +35,14 @@
void imx8m_clock_set_target_val(int clock_id, u32 val)
{
- void *ccm = IOMEM(MX8M_CCM_BASE_ADDR);
+ void __iomem *ccm = IOMEM(MX8M_CCM_BASE_ADDR);
writel(val, ccm + IMX8M_CCM_TARGET_ROOTn(clock_id));
}
void imx8m_ccgr_clock_enable(int index)
{
- void *ccm = IOMEM(MX8M_CCM_BASE_ADDR);
+ void __iomem *ccm = IOMEM(MX8M_CCM_BASE_ADDR);
writel(IMX8M_CCM_CCGR_SETTINGn_NEEDED(0),
ccm + IMX8M_CCM_CCGRn_SET(index));
@@ -50,7 +50,7 @@ void imx8m_ccgr_clock_enable(int index)
void imx8m_ccgr_clock_disable(int index)
{
- void *ccm = IOMEM(MX8M_CCM_BASE_ADDR);
+ void __iomem *ccm = IOMEM(MX8M_CCM_BASE_ADDR);
writel(IMX8M_CCM_CCGR_SETTINGn_NEEDED(0),
ccm + IMX8M_CCM_CCGRn_CLR(index));
--
2.30.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH 2/2] ARM: i.MX8MM: move system counter enabling into imx8mm_cpu_lowlevel_init
2021-01-29 15:25 [PATCH 1/2] ARM: i.MX8MM: fix sparse warnings in early clock code Ahmad Fatoum
@ 2021-01-29 15:25 ` Ahmad Fatoum
2021-02-01 8:45 ` [PATCH 1/2] ARM: i.MX8MM: fix sparse warnings in early clock code Sascha Hauer
1 sibling, 0 replies; 3+ messages in thread
From: Ahmad Fatoum @ 2021-01-29 15:25 UTC (permalink / raw)
To: barebox; +Cc: Ahmad Fatoum
From: Ahmad Fatoum <ahmad@a3f.at>
Other i.MX8MM boards will likely need this as well, so just move it
into the helper and while at it, rewrite it using
imx8m_ccgr_clock_enable, which is defined as:
void __iomem *ccm = IOMEM(MX8M_CCM_BASE_ADDR);
writel(IMX8M_CCM_CCGR_SETTINGn_NEEDED(0),
ccm + IMX8M_CCM_CCGRn_SET(index));
No functional change.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
arch/arm/boards/nxp-imx8mm-evk/lowlevel.c | 5 -----
arch/arm/mach-imx/cpu_init.c | 4 ++++
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boards/nxp-imx8mm-evk/lowlevel.c b/arch/arm/boards/nxp-imx8mm-evk/lowlevel.c
index 2297dc01e77f..4bd29c226912 100644
--- a/arch/arm/boards/nxp-imx8mm-evk/lowlevel.c
+++ b/arch/arm/boards/nxp-imx8mm-evk/lowlevel.c
@@ -172,11 +172,6 @@ static __noreturn noinline void nxp_imx8mm_evk_start(void)
ENTRY_FUNCTION(start_nxp_imx8mm_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));
-
imx8mm_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 cc7a409e373a..9d86353e2255 100644
--- a/arch/arm/mach-imx/cpu_init.c
+++ b/arch/arm/mach-imx/cpu_init.c
@@ -20,6 +20,7 @@
#include <mach/generic.h>
#include <mach/imx7-regs.h>
#include <mach/imx8mq-regs.h>
+#include <mach/imx8m-ccm-regs.h>
#include <common.h>
#include <io.h>
#include <asm/syscounter.h>
@@ -79,6 +80,9 @@ static void imx8m_cpu_lowlevel_init(void)
void imx8mm_cpu_lowlevel_init(void)
{
+ /* ungate system counter */
+ imx8m_ccgr_clock_enable(IMX8M_CCM_CCGR_SCTR);
+
imx8m_cpu_lowlevel_init();
}
--
2.30.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH 1/2] ARM: i.MX8MM: fix sparse warnings in early clock code
2021-01-29 15:25 [PATCH 1/2] ARM: i.MX8MM: fix sparse warnings in early clock code Ahmad Fatoum
2021-01-29 15:25 ` [PATCH 2/2] ARM: i.MX8MM: move system counter enabling into imx8mm_cpu_lowlevel_init Ahmad Fatoum
@ 2021-02-01 8:45 ` Sascha Hauer
1 sibling, 0 replies; 3+ messages in thread
From: Sascha Hauer @ 2021-02-01 8:45 UTC (permalink / raw)
To: Ahmad Fatoum; +Cc: barebox
On Fri, Jan 29, 2021 at 04:25:53PM +0100, Ahmad Fatoum wrote:
> Some __iomem markers were being casted away. Fix that.
>
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
> arch/arm/mach-imx/imx8m.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
Applied, thanks
Sascha
>
> diff --git a/arch/arm/mach-imx/imx8m.c b/arch/arm/mach-imx/imx8m.c
> index b9e01a1d1854..350d203539fc 100644
> --- a/arch/arm/mach-imx/imx8m.c
> +++ b/arch/arm/mach-imx/imx8m.c
> @@ -35,14 +35,14 @@
>
> void imx8m_clock_set_target_val(int clock_id, u32 val)
> {
> - void *ccm = IOMEM(MX8M_CCM_BASE_ADDR);
> + void __iomem *ccm = IOMEM(MX8M_CCM_BASE_ADDR);
>
> writel(val, ccm + IMX8M_CCM_TARGET_ROOTn(clock_id));
> }
>
> void imx8m_ccgr_clock_enable(int index)
> {
> - void *ccm = IOMEM(MX8M_CCM_BASE_ADDR);
> + void __iomem *ccm = IOMEM(MX8M_CCM_BASE_ADDR);
>
> writel(IMX8M_CCM_CCGR_SETTINGn_NEEDED(0),
> ccm + IMX8M_CCM_CCGRn_SET(index));
> @@ -50,7 +50,7 @@ void imx8m_ccgr_clock_enable(int index)
>
> void imx8m_ccgr_clock_disable(int index)
> {
> - void *ccm = IOMEM(MX8M_CCM_BASE_ADDR);
> + void __iomem *ccm = IOMEM(MX8M_CCM_BASE_ADDR);
>
> writel(IMX8M_CCM_CCGR_SETTINGn_NEEDED(0),
> ccm + IMX8M_CCM_CCGRn_CLR(index));
> --
> 2.30.0
>
>
> _______________________________________________
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-02-01 8:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-29 15:25 [PATCH 1/2] ARM: i.MX8MM: fix sparse warnings in early clock code Ahmad Fatoum
2021-01-29 15:25 ` [PATCH 2/2] ARM: i.MX8MM: move system counter enabling into imx8mm_cpu_lowlevel_init Ahmad Fatoum
2021-02-01 8:45 ` [PATCH 1/2] ARM: i.MX8MM: fix sparse warnings in early clock code Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox