diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2023-03-02 12:33:23 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-03-07 10:39:30 +0100 |
| commit | 98ae00b3131d9f99802ba67b194f0b0032237df1 (patch) | |
| tree | 7887aea6c5f68df53e482f6e85143b132204a7b6 /arch/arm/mach-vexpress | |
| parent | bf5976c3542afcf4a31e710b768d1637189197a3 (diff) | |
| download | barebox-98ae00b3131d9f99802ba67b194f0b0032237df1.tar.gz barebox-98ae00b3131d9f99802ba67b194f0b0032237df1.tar.xz | |
ARM: vexpress: Drop unnecessary initcall
Call vexpress_restart_register_feature() from vexpress_*init() to
get rid of an unnecessary initcall.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-vexpress')
| -rw-r--r-- | arch/arm/mach-vexpress/reset.c | 9 | ||||
| -rw-r--r-- | arch/arm/mach-vexpress/v2m.c | 5 |
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-vexpress/reset.c b/arch/arm/mach-vexpress/reset.c index f0fa75330e..0d626db7d7 100644 --- a/arch/arm/mach-vexpress/reset.c +++ b/arch/arm/mach-vexpress/reset.c @@ -9,7 +9,7 @@ #include <init.h> #include <restart.h> #include <linux/amba/sp805.h> - +#include <mach/vexpress/vexpress.h> #include <mach/vexpress/devices.h> void __iomem *v2m_wdt_base; @@ -22,10 +22,9 @@ static void __noreturn vexpress_reset_soc(struct restart_handler *rst) hang(); } -static int restart_register_feature(void) +void vexpress_restart_register_feature(void __iomem *base) { - restart_handler_register_fn("soc-wdt", vexpress_reset_soc); + v2m_wdt_base = base; - return 0; + restart_handler_register_fn("soc-wdt", vexpress_reset_soc); } -coredevice_initcall(restart_register_feature); diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c index 9181d7e2ef..5c4c2478cf 100644 --- a/arch/arm/mach-vexpress/v2m.c +++ b/arch/arm/mach-vexpress/v2m.c @@ -8,6 +8,7 @@ #include <io.h> #include <asm/hardware/sp810.h> #include <mach/vexpress/devices.h> +#include <mach/vexpress/vexpress.h> void __iomem *v2m_sysreg_base; @@ -26,12 +27,12 @@ static void v2m_sysctl_init(void __iomem *base) void vexpress_a9_legacy_init(void) { - v2m_wdt_base = IOMEM(0x1000f000); v2m_sysctl_init(IOMEM(0x10001000)); + vexpress_restart_register_feature(IOMEM(0x1000f000)); } void vexpress_init(void) { - v2m_wdt_base = IOMEM(0x1c0f0000); v2m_sysctl_init(IOMEM(0x1c020000)); + vexpress_restart_register_feature(IOMEM(0x1c0f0000)); } |