Merge tag 'timers-urgent-2021-02-22' of git://git.kernel.org/pub/scm/linux/kernel...

Pull timer fixes from Thomas Gleixner:
 "A small set of clockevent fixes which fell through the cracks before
  the 5.11 release:

   - Ensure a clock is enabled on sh_cmt

   - Trivial compile fail and compile warning fixes"

* tag 'timers-urgent-2021-02-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource/drivers/mxs_timer: Add missing semicolon when DEBUG is defined
  clocksource/drivers/sh_cmt: Make sure channel clock supply is enabled
  clocksource/drivers/ixp4xx: Select TIMER_OF when needed

diff --combined drivers/clocksource/Kconfig
index d184000eb09e1e36e696c410c9e5147cfa9dafb1,66be9ea69e3329e51bd82f282d4ee32985cde7ca..39aa21d01e054a124b6839c5deceadd0c2bfb8d0
--- 1/drivers/clocksource/Kconfig
--- 2/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@@ -79,6 -79,7 +79,7 @@@ config IXP4XX_TIME
        bool "Intel XScale IXP4xx timer driver" if COMPILE_TEST
        depends on HAS_IOMEM
        select CLKSRC_MMIO
+       select TIMER_OF if OF
        help
          Enables support for the Intel XScale IXP4xx SoC timer.
  
@@@ -197,6 -198,12 +198,6 @@@ config CLPS711X_TIME
        help
          Enables support for the Cirrus Logic PS711 timer.
  
 -config ATLAS7_TIMER
 -      bool "Atlas7 timer driver" if COMPILE_TEST
 -      select CLKSRC_MMIO
 -      help
 -        Enables support for the Atlas7 timer.
 -
  config MXS_TIMER
        bool "MXS timer driver" if COMPILE_TEST
        select CLKSRC_MMIO
@@@ -204,6 -211,19 +205,6 @@@
        help
          Enables support for the MXS timer.
  
 -config PRIMA2_TIMER
 -      bool "Prima2 timer driver" if COMPILE_TEST
 -      select CLKSRC_MMIO
 -      help
 -        Enables support for the Prima2 timer.
 -
 -config U300_TIMER
 -      bool "U300 timer driver" if COMPILE_TEST
 -      depends on ARM
 -      select CLKSRC_MMIO
 -      help
 -        Enables support for the U300 timer.
 -
  config NSPIRE_TIMER
        bool "NSpire timer driver" if COMPILE_TEST
        select CLKSRC_MMIO
@@@ -223,6 -243,15 +224,6 @@@ config INTEGRATOR_AP_TIME
        help
          Enables support for the Integrator-AP timer.
  
 -config CLKSRC_EFM32
 -      bool "Clocksource for Energy Micro's EFM32 SoCs" if !ARCH_EFM32
 -      depends on OF && ARM && (ARCH_EFM32 || COMPILE_TEST)
 -      select CLKSRC_MMIO
 -      default ARCH_EFM32
 -      help
 -        Support to use the timers of EFM32 SoCs as clock source and clock
 -        event device.
 -
  config CLKSRC_LPC32XX
        bool "Clocksource for LPC32XX" if COMPILE_TEST
        depends on HAS_IOMEM
@@@ -539,6 -568,14 +540,6 @@@ config CLKSRC_MIPS_GI
        select CLOCKSOURCE_WATCHDOG
        select TIMER_OF
  
 -config CLKSRC_TANGO_XTAL
 -      bool "Clocksource for Tango SoC" if COMPILE_TEST
 -      depends on ARM
 -      select TIMER_OF
 -      select CLKSRC_MMIO
 -      help
 -        This enables the clocksource for Tango SoC.
 -
  config CLKSRC_PXA
        bool "Clocksource for PXA or SA-11x0 platform" if COMPILE_TEST
        depends on HAS_IOMEM