From 5faf115694c1a5c191757fa539f57afc58176ae5 Mon Sep 17 00:00:00 2001
From: Oliver Schildan <oliver.schildan@wago.com>
Date: Thu, 17 Aug 2023 15:23:39 +0200
Subject: [PATCH] arm: mach-omap2: wsysinit: make it also usable in k3
 architectures

---
 arch/arm/mach-omap2/wsysinit.c | 2 ++
 arch/arm64/Kconfig             | 5 +++++
 arch/arm64/kernel/Makefile     | 2 ++
 3 files changed, 9 insertions(+)

diff --git a/arch/arm/mach-omap2/wsysinit.c b/arch/arm/mach-omap2/wsysinit.c
index ff139103fc50..eb9567287313 100644
--- a/arch/arm/mach-omap2/wsysinit.c
+++ b/arch/arm/mach-omap2/wsysinit.c
@@ -21,7 +21,9 @@
 #include <linux/kobject.h>
 #include <linux/fs.h>
 #include <linux/timex.h>
+#ifndef CONFIG_ARCH_K3
 #include <asm/mach-types.h>
+#endif
 #include <linux/delay.h>
 
 #ifdef CONFIG_ARCH_OMAP3
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index bc53a9889d03..d46167246689 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -1,4 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0-only
+config WAGO_SYSTEM_BASED_STARTUP
+	bool "WAGO System based startup code"
+	help
+	 Enable WAGO System based startup code
+
 config ARM64
 	def_bool y
 	select ACPI_APMT if ACPI
diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile
index d95b3d6b471a..a21e300fb2a2 100644
--- a/arch/arm64/kernel/Makefile
+++ b/arch/arm64/kernel/Makefile
@@ -36,6 +36,8 @@ obj-y			:= debug-monitors.o entry.o irq.o fpsimd.o		\
 			   syscall.o proton-pack.o idreg-override.o idle.o	\
 			   patching.o
 
+obj-$(CONFIG_WAGO_SYSTEM_BASED_STARTUP)  += ../../arm/mach-omap2/wsysinit.o
+
 obj-$(CONFIG_COMPAT)			+= sys32.o signal32.o			\
 					   sys_compat.o
 obj-$(CONFIG_COMPAT)			+= sigreturn32.o