diff options
| author | Andrey Smirnov <andrew.smirnov@gmail.com> | 2018-04-26 22:49:43 -0700 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-05-08 12:26:00 +0200 |
| commit | b1347e1de70e63a6e0154e641c65ac909793d2ac (patch) | |
| tree | 495edb0e0d9003ab7d818b8243325165ca71a34f /arch/arm | |
| parent | 0c37e94e74692b8077971c67884e3fc0d39c2f8c (diff) | |
| download | barebox-b1347e1de70e63a6e0154e641c65ac909793d2ac.tar.gz barebox-b1347e1de70e63a6e0154e641c65ac909793d2ac.tar.xz | |
ARM: i.MX: Make imx6_reset_reasons global
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>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-imx/imx.c | 9 | ||||
| -rw-r--r-- | arch/arm/mach-imx/imx6.c | 11 | ||||
| -rw-r--r-- | 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 bf15f0b063..1b4c1b3df1 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 8d2788c59d..73cd4eb6dc 100644 --- a/arch/arm/mach-imx/imx6.c +++ b/arch/arm/mach-imx/imx6.c @@ -148,15 +148,6 @@ static void imx6ul_enet_clk_init(void) writel(val, gprbase + IOMUXC_GPR1); } -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; @@ -206,7 +197,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 23e73d3b58..0894b95ab3 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__ */ |