From ea9b3d7e6b1c1d88ae95d353f7b89aff96fb8365 Mon Sep 17 00:00:00 2001 From: Chun-Hung Wu Date: Thu, 27 Aug 2020 11:19:09 +0800 Subject: [PATCH] ANDROID: GKI: enable CONFIG_MTK_TIMER It's needed by MTK board for reasons below: After working with built-in mtk timer(timer-mediatek) as tick-broadcast devices for few weeks, we found some issues caused by linux timer framework: 1. tick broadcast installed by insmod cannot switch to oneshot mode correctly (BUG: 161822795) 2. rcu warning will be shown if we force to re-enabled tick-broadcast for each cpu when new tick broadcast device is added by insmod (timer-mediatek.c in our case) Bug: 161675989 Change-Id: If3056df11d8256f2af4a6928820faed9f690b3db Signed-off-by: Freddy Hsin Signed-off-by: Chun-Hung Wu --- arch/arm64/configs/gki_defconfig | 1 + drivers/clocksource/Kconfig | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index c13cd2c43e29..cb7c9a5cb859 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -439,6 +439,7 @@ CONFIG_COMMON_CLK_SCPI=y # CONFIG_SUNXI_CCU is not set CONFIG_HWSPINLOCK=y # CONFIG_SUN50I_ERRATUM_UNKNOWN1 is not set +CONFIG_MTK_TIMER=y CONFIG_MAILBOX=y CONFIG_IOMMU_LIMIT_IOVA_ALIGNMENT=y CONFIG_REMOTEPROC=y diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 8b39f38ee1b0..49821314dd54 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -473,7 +473,7 @@ config SYS_SUPPORTS_SH_CMT bool config MTK_TIMER - bool "Mediatek timer driver" if COMPILE_TEST + bool "Mediatek timer driver" depends on HAS_IOMEM select TIMER_OF select CLKSRC_MMIO