Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

Pull missed timer updates from Thomas Gleixner:
 "This is a branch which got forgotten during the merge window, but it
  contains only fixes and hardware enablement. No fundamental changes.

   - Various fixes for the imx-tpm clocksource driver

   - A new timer driver for the NCPM7xx SoC family"

* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource/drivers/imx-tpm: Add different counter width support
  clocksource/drivers/imx-tpm: Correct some registers operation flow
  clocksource/drivers/imx-tpm: Fix typo of clock name
  dt-bindings: timer: tpm: fix typo of clock name
  clocksource/drivers/npcm: Add NPCM7xx timer driver
  dt-binding: timer: document NPCM7xx timer DT bindings

diff --combined drivers/clocksource/Kconfig
index 9ee2888275c1954d433a08636d27bb25d83c1eb1,76194bc20bdf1709d3369855a4da1f8e4a6c9cd8..8e8a09755d10431e27f42479a08c8a6fb842ab0c
--- 1/drivers/clocksource/Kconfig
--- 2/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@@ -21,9 -21,6 +21,9 @@@ config CLKEVT_I825
  config I8253_LOCK
        bool
  
 +config OMAP_DM_TIMER
 +      bool
 +
  config CLKBLD_I8253
        def_bool y if CLKSRC_I8253 || CLKEVT_I8253 || I8253_LOCK
  
@@@ -133,6 -130,14 +133,14 @@@ config VT8500_TIME
        help
          Enables support for the VT8500 driver.
  
+ config NPCM7XX_TIMER
+       bool "NPCM7xx timer driver" if COMPILE_TEST
+       depends on HAS_IOMEM
+       select CLKSRC_MMIO
+       help
+         Enable 24-bit TIMER0 and TIMER1 counters in the NPCM7xx architecture,
+         While TIMER0 serves as clockevent and TIMER1 serves as clocksource.
+ 
  config CADENCE_TTC_TIMER
        bool "Cadence TTC timer driver" if COMPILE_TEST
        depends on COMMON_CLK
@@@ -389,12 -394,16 +397,12 @@@ config ATMEL_PI
  
  config ATMEL_ST
        bool "Atmel ST timer support" if COMPILE_TEST
 +      depends on HAS_IOMEM
        select TIMER_OF
        select MFD_SYSCON
        help
          Support for the Atmel ST timer.
  
 -config CLKSRC_METAG_GENERIC
 -      def_bool y if METAG
 -      help
 -        This option enables support for the Meta per-thread timers.
 -
  config CLKSRC_EXYNOS_MCT
        bool "Exynos multi core timer driver" if COMPILE_TEST
        depends on ARM || ARM64
@@@ -590,13 -599,4 +598,13 @@@ config CLKSRC_ST_LP
          Enable this option to use the Low Power controller timer
          as clocksource.
  
 +config ATCPIT100_TIMER
 +      bool "ATCPIT100 timer driver"
 +      depends on NDS32 || COMPILE_TEST
 +      depends on HAS_IOMEM
 +      select TIMER_OF
 +      default NDS32
 +      help
 +        This option enables support for the Andestech ATCPIT100 timers.
 +
  endmenu

diff --combined drivers/clocksource/Makefile
index e8e76dfef00bbc500d5e8a9b06cb0947b6518e82,74387877f7cfd1ec09603ca7d71c8dff4c0c4697..00caf37e52f9c6cad3913c2c0b18bd32aa20756a
--- 1/drivers/clocksource/Makefile
--- 2/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@@ -16,7 -16,6 +16,7 @@@ obj-$(CONFIG_EM_TIMER_STI)    += em_sti.
  obj-$(CONFIG_CLKBLD_I8253)    += i8253.o
  obj-$(CONFIG_CLKSRC_MMIO)     += mmio.o
  obj-$(CONFIG_DIGICOLOR_TIMER) += timer-digicolor.o
 +obj-$(CONFIG_OMAP_DM_TIMER)   += timer-ti-dm.o
  obj-$(CONFIG_DW_APB_TIMER)    += dw_apb_timer.o
  obj-$(CONFIG_DW_APB_TIMER_OF) += dw_apb_timer_of.o
  obj-$(CONFIG_FTTMR010_TIMER)  += timer-fttmr010.o
@@@ -56,12 -55,14 +56,13 @@@ obj-$(CONFIG_CLKSRC_NPS)   += timer-nps.
  obj-$(CONFIG_OXNAS_RPS_TIMER) += timer-oxnas-rps.o
  obj-$(CONFIG_OWL_TIMER)               += owl-timer.o
  obj-$(CONFIG_SPRD_TIMER)      += timer-sprd.o
+ obj-$(CONFIG_NPCM7XX_TIMER)   += timer-npcm7xx.o
  
  obj-$(CONFIG_ARC_TIMERS)              += arc_timer.o
  obj-$(CONFIG_ARM_ARCH_TIMER)          += arm_arch_timer.o
  obj-$(CONFIG_ARM_GLOBAL_TIMER)                += arm_global_timer.o
  obj-$(CONFIG_ARMV7M_SYSTICK)          += armv7m_systick.o
  obj-$(CONFIG_ARM_TIMER_SP804)         += timer-sp804.o
 -obj-$(CONFIG_CLKSRC_METAG_GENERIC)    += metag_generic.o
  obj-$(CONFIG_ARCH_HAS_TICK_BROADCAST) += dummy_timer.o
  obj-$(CONFIG_KEYSTONE_TIMER)          += timer-keystone.o
  obj-$(CONFIG_INTEGRATOR_AP_TIMER)     += timer-integrator-ap.o
@@@ -76,4 -77,3 +77,4 @@@ obj-$(CONFIG_H8300_TMR16)             += h8300_tim
  obj-$(CONFIG_H8300_TPU)                       += h8300_tpu.o
  obj-$(CONFIG_CLKSRC_ST_LPC)           += clksrc_st_lpc.o
  obj-$(CONFIG_X86_NUMACHIP)            += numachip.o
 +obj-$(CONFIG_ATCPIT100_TIMER)         += timer-atcpit100.o