[openwrt/openwrt] imx: re-enable ARM arch timer

LEDE Commits lede-commits at lists.infradead.org
Thu Mar 31 08:31:55 PDT 2022


ynezz pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/bf1c3a5f3ca1fe3446c7a65a2c7796f5ee41ea02

commit bf1c3a5f3ca1fe3446c7a65a2c7796f5ee41ea02
Author: Petr Štetiar <ynezz at true.cz>
AuthorDate: Thu Mar 31 15:50:46 2022 +0200

    imx: re-enable ARM arch timer
    
    Config option `ARM_ARCH_TIMER` has been removed during rebasing onto
    5.15 kernel in commit 2b395c298247 ("imx: update config for 5.15").
    
    Anyway, as stated in commit 8cdc356f8c30 ("mediatek: mt7623: Re-enable
    ARM arch timer") config option `ARM_ARCH_TIMER` cannot be enabled in the
    config directly; it is only selected by `HAVE_ARM_ARCH_TIMER`. We need
    to enable the latter in our config.
    
    Fixes: 2b395c298247 ("imx: update config for 5.15")
    Reported-by: Piotr Dymacz <pepe2k at gmail.com>
    Signed-off-by: Petr Štetiar <ynezz at true.cz>
---
 target/linux/imx/config-5.15 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/target/linux/imx/config-5.15 b/target/linux/imx/config-5.15
index 44c02eccbc..f27828e0bf 100644
--- a/target/linux/imx/config-5.15
+++ b/target/linux/imx/config-5.15
@@ -16,6 +16,7 @@ CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARM=y
+CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
 CONFIG_ARM_CRYPTO=y
 CONFIG_ARM_ERRATA_754322=y
 CONFIG_ARM_ERRATA_764369=y
@@ -210,6 +211,7 @@ 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_HWMON=y
 CONFIG_HW_RANDOM=y




More information about the lede-commits mailing list