mediatek: mt7623 enable arch-timer with a patch

Last attempt on this has a typo and doen't work.
It seems that this is a common problem occurring on every kernel bump,
so let's enforce arch timer support for mt7623 with a patch instead.

Fixes: 9a22943eb2 ("mediatek: 5.15: re-enable arch timer on MT7623 as well")
Signed-off-by: Chuanhong Guo <gch981213@gmail.com>

diff --git a/target/linux/mediatek/mt7623/config-5.15 b/target/linux/mediatek/mt7623/config-5.15
index 62672ec8fd17eeb5fe4e62250374e84e8e7bf1ec..e39bc5d584997b5210475ff03e7fb220f5e35051 100644 (file)
--- a/target/linux/mediatek/mt7623/config-5.15
+++ b/target/linux/mediatek/mt7623/config-5.15
@@ -16,6 +16,8 @@ CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARM=y
 CONFIG_ARM_APPENDED_DTB=y
+CONFIG_ARM_ARCH_TIMER=y
+CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
 # CONFIG_ARM_ATAG_DTB_COMPAT is not set
 CONFIG_ARM_CPU_SUSPEND=y
 # CONFIG_ARM_CPU_TOPOLOGY is not set
@@ -246,7 +248,6 @@ CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
-CONFIG_HAVE_ARM_ARCH_TIMER=Y
 CONFIG_HAVE_SMP=y
 CONFIG_HDMI=y
 CONFIG_HID=y
@@ -300,9 +301,7 @@ CONFIG_JBD2=y
 # CONFIG_JOYSTICK_ANALOG is not set
 # CONFIG_JOYSTICK_AS5011 is not set
 # CONFIG_JOYSTICK_COBRA is not set
-# CONFIG_JOYSTICK_DB9 is not set
 # CONFIG_JOYSTICK_FSIA6B is not set
-# CONFIG_JOYSTICK_GAMECON is not set
 # CONFIG_JOYSTICK_GF2K is not set
 # CONFIG_JOYSTICK_GRIP is not set
 # CONFIG_JOYSTICK_GRIP_MP is not set
@@ -319,9 +318,7 @@ CONFIG_JBD2=y
 # CONFIG_JOYSTICK_SPACEORB is not set
 # CONFIG_JOYSTICK_STINGER is not set
 # CONFIG_JOYSTICK_TMDC is not set
-# CONFIG_JOYSTICK_TURBOGRAFX is not set
 # CONFIG_JOYSTICK_TWIDJOY is not set
-# CONFIG_JOYSTICK_WALKERA0701 is not set
 # CONFIG_JOYSTICK_WARRIOR is not set
 # CONFIG_JOYSTICK_XPAD is not set
 # CONFIG_JOYSTICK_ZHENHUA is not set

diff --git a/target/linux/mediatek/patches-5.15/103-mt7623-enable-arch-timer.patch b/target/linux/mediatek/patches-5.15/103-mt7623-enable-arch-timer.patch
new file mode 100644 (file)
index 0000000..ea455c4
--- /dev/null
+++ b/target/linux/mediatek/patches-5.15/103-mt7623-enable-arch-timer.patch
@@ -0,0 +1,25 @@
+From d6a596012150960f0f3a214d31bbac4b607dbd1e Mon Sep 17 00:00:00 2001
+From: Chuanhong Guo <gch981213@gmail.com>
+Date: Fri, 29 Apr 2022 10:40:56 +0800
+Subject: [PATCH] arm: mediatek: select arch timer for mt7623
+
+Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
+---
+ arch/arm/mach-mediatek/Kconfig | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/arm/mach-mediatek/Kconfig b/arch/arm/mach-mediatek/Kconfig
+index 35a3430c7942..8a8d9142260a 100644
+--- a/arch/arm/mach-mediatek/Kconfig
++++ b/arch/arm/mach-mediatek/Kconfig
+@@ -26,6 +26,7 @@ config MACH_MT6592
+ config MACH_MT7623
+       bool "MediaTek MT7623 SoCs support"
+       default ARCH_MEDIATEK
++      select HAVE_ARM_ARCH_TIMER
+ 
+ config MACH_MT7629
+       bool "MediaTek MT7629 SoCs support"
+-- 
+2.35.1
+