From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH 3/6] ARM: i.MX: Make imx6_reset_reasons global
Date: Thu, 26 Apr 2018 22:49:43 -0700 [thread overview]
Message-ID: <20180427054946.11687-4-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20180427054946.11687-1-andrew.smirnov@gmail.com>
Both i.MX51 and i.MX53 have exactly the same reset source mapping, so
rename imx6_reset_reasons to imx_reset_reasons and make it a globally
visible constant so it could be shared.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
arch/arm/mach-imx/imx.c | 9 +++++++++
arch/arm/mach-imx/imx6.c | 11 +----------
arch/arm/mach-imx/include/mach/reset-reason.h | 2 ++
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/arch/arm/mach-imx/imx.c b/arch/arm/mach-imx/imx.c
index bf15f0b06..1b4c1b3df 100644
--- a/arch/arm/mach-imx/imx.c
+++ b/arch/arm/mach-imx/imx.c
@@ -153,6 +153,15 @@ static int imx_init(void)
}
postcore_initcall(imx_init);
+const struct imx_reset_reason imx_reset_reasons[] = {
+ { IMX_SRC_SRSR_IPP_RESET, RESET_POR, 0 },
+ { IMX_SRC_SRSR_WDOG1_RESET, RESET_WDG, 0 },
+ { IMX_SRC_SRSR_JTAG_RESET, RESET_JTAG, 0 },
+ { IMX_SRC_SRSR_JTAG_SW_RESET, RESET_JTAG, 0 },
+ { IMX_SRC_SRSR_WARM_BOOT, RESET_RST, 0 },
+ { /* sentinel */ }
+};
+
void imx_set_reset_reason(void __iomem *srsr,
const struct imx_reset_reason *reasons)
{
diff --git a/arch/arm/mach-imx/imx6.c b/arch/arm/mach-imx/imx6.c
index 49610bf08..dc09088ab 100644
--- a/arch/arm/mach-imx/imx6.c
+++ b/arch/arm/mach-imx/imx6.c
@@ -174,15 +174,6 @@ int imx6_cpu_revision(void)
return soc_revision;
}
-static const struct imx_reset_reason imx6_reset_reasons[] = {
- { IMX_SRC_SRSR_IPP_RESET, RESET_POR, 0 },
- { IMX_SRC_SRSR_WDOG1_RESET, RESET_WDG, 0 },
- { IMX_SRC_SRSR_JTAG_RESET, RESET_JTAG, 0 },
- { IMX_SRC_SRSR_JTAG_SW_RESET, RESET_JTAG, 0 },
- { IMX_SRC_SRSR_WARM_BOOT, RESET_RST, 0 },
- { /* sentinel */ }
-};
-
int imx6_init(void)
{
const char *cputypestr;
@@ -232,7 +223,7 @@ int imx6_init(void)
}
imx_set_silicon_revision(cputypestr, mx6_silicon_revision);
- imx_set_reset_reason(src + IMX6_SRC_SRSR, imx6_reset_reasons);
+ imx_set_reset_reason(src + IMX6_SRC_SRSR, imx_reset_reasons);
imx6_setup_ipu_qos();
imx6ul_enet_clk_init();
diff --git a/arch/arm/mach-imx/include/mach/reset-reason.h b/arch/arm/mach-imx/include/mach/reset-reason.h
index 23e73d3b5..0894b95ab 100644
--- a/arch/arm/mach-imx/include/mach/reset-reason.h
+++ b/arch/arm/mach-imx/include/mach/reset-reason.h
@@ -34,4 +34,6 @@ struct imx_reset_reason {
void imx_set_reset_reason(void __iomem *, const struct imx_reset_reason *);
+extern const struct imx_reset_reason imx_reset_reasons[];
+
#endif /* __MACH_RESET_REASON_H__ */
--
2.14.3
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2018-04-27 5:50 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-27 5:49 [PATCH 0/6] i.MX51, 53 reset reason detection support Andrey Smirnov
2018-04-27 5:49 ` [PATCH 1/6] ARM: i.MX51: Replace expicit casts with IOMEM Andrey Smirnov
2018-04-27 5:49 ` [PATCH 2/6] ARM: i.MX: Fix incorrect IMX_SRC_SRSR_CSU_RESET Andrey Smirnov
2018-04-27 5:49 ` Andrey Smirnov [this message]
2018-04-27 5:49 ` [PATCH 4/6] ARM: i.MX: Introduce IMX_SRC_SRSR Andrey Smirnov
2018-04-27 5:49 ` [PATCH 5/6] ARM: i.MX53: Record reset reason as a part of startup Andrey Smirnov
2018-04-27 5:49 ` [PATCH 6/6] ARM: i.MX51: " Andrey Smirnov
2018-05-02 10:32 ` [PATCH 0/6] i.MX51, 53 reset reason detection support 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=20180427054946.11687-4-andrew.smirnov@gmail.com \
--to=andrew.smirnov@gmail.com \
--cc=barebox@lists.infradead.org \
/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