From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 4 Nov 2018 16:15:15 +0000 (-0800)
Subject: Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.20-rc1~3
X-Git-Url: https://repo.jachan.dev/J-linux.git/commitdiff_plain/35e7452442687d7bd70f042ddfa92f89311b039c?hp=-c

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

Pull more timer updates from Thomas Gleixner:
 "A set of commits for the new C-SKY architecture timers"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  dt-bindings: timer: gx6605s SOC timer
  clocksource/drivers/c-sky: Add gx6605s SOC system timer
  dt-bindings: timer: C-SKY Multi-processor timer
  clocksource/drivers/c-sky: Add C-SKY SMP timer
---

35e7452442687d7bd70f042ddfa92f89311b039c
diff --combined drivers/clocksource/Makefile
index e33b21d3f9d8,919633133271..dd9138104568
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@@ -23,8 -23,8 +23,8 @@@ obj-$(CONFIG_FTTMR010_TIMER)	+= timer-f
  obj-$(CONFIG_ROCKCHIP_TIMER)      += rockchip_timer.o
  obj-$(CONFIG_CLKSRC_NOMADIK_MTU)	+= nomadik-mtu.o
  obj-$(CONFIG_CLKSRC_DBX500_PRCMU)	+= clksrc-dbx500-prcmu.o
 -obj-$(CONFIG_ARMADA_370_XP_TIMER)	+= time-armada-370-xp.o
 -obj-$(CONFIG_ORION_TIMER)	+= time-orion.o
 +obj-$(CONFIG_ARMADA_370_XP_TIMER)	+= timer-armada-370-xp.o
 +obj-$(CONFIG_ORION_TIMER)	+= timer-orion.o
  obj-$(CONFIG_BCM2835_TIMER)	+= bcm2835_timer.o
  obj-$(CONFIG_CLPS711X_TIMER)	+= clps711x-timer.o
  obj-$(CONFIG_ATLAS7_TIMER)	+= timer-atlas7.o
@@@ -36,25 -36,25 +36,25 @@@ obj-$(CONFIG_SUN4I_TIMER)	+= sun4i_time
  obj-$(CONFIG_SUN5I_HSTIMER)	+= timer-sun5i.o
  obj-$(CONFIG_MESON6_TIMER)	+= meson6_timer.o
  obj-$(CONFIG_TEGRA_TIMER)	+= tegra20_timer.o
 -obj-$(CONFIG_VT8500_TIMER)	+= vt8500_timer.o
 -obj-$(CONFIG_NSPIRE_TIMER)	+= zevio-timer.o
 +obj-$(CONFIG_VT8500_TIMER)	+= timer-vt8500.o
 +obj-$(CONFIG_NSPIRE_TIMER)	+= timer-zevio.o
  obj-$(CONFIG_BCM_KONA_TIMER)	+= bcm_kona_timer.o
 -obj-$(CONFIG_CADENCE_TTC_TIMER)	+= cadence_ttc_timer.o
 -obj-$(CONFIG_CLKSRC_EFM32)	+= time-efm32.o
 +obj-$(CONFIG_CADENCE_TTC_TIMER)	+= timer-cadence-ttc.o
 +obj-$(CONFIG_CLKSRC_EFM32)	+= timer-efm32.o
  obj-$(CONFIG_CLKSRC_STM32)	+= timer-stm32.o
  obj-$(CONFIG_CLKSRC_EXYNOS_MCT)	+= exynos_mct.o
 -obj-$(CONFIG_CLKSRC_LPC32XX)	+= time-lpc32xx.o
 +obj-$(CONFIG_CLKSRC_LPC32XX)	+= timer-lpc32xx.o
  obj-$(CONFIG_CLKSRC_MPS2)	+= mps2-timer.o
  obj-$(CONFIG_CLKSRC_SAMSUNG_PWM)	+= samsung_pwm_timer.o
 -obj-$(CONFIG_FSL_FTM_TIMER)	+= fsl_ftm_timer.o
 -obj-$(CONFIG_VF_PIT_TIMER)	+= vf_pit_timer.o
 -obj-$(CONFIG_CLKSRC_QCOM)	+= qcom-timer.o
 +obj-$(CONFIG_FSL_FTM_TIMER)	+= timer-fsl-ftm.o
 +obj-$(CONFIG_VF_PIT_TIMER)	+= timer-vf-pit.o
 +obj-$(CONFIG_CLKSRC_QCOM)	+= timer-qcom.o
  obj-$(CONFIG_MTK_TIMER)		+= timer-mediatek.o
 -obj-$(CONFIG_CLKSRC_PISTACHIO)	+= time-pistachio.o
 +obj-$(CONFIG_CLKSRC_PISTACHIO)	+= timer-pistachio.o
  obj-$(CONFIG_CLKSRC_TI_32K)	+= timer-ti-32k.o
  obj-$(CONFIG_CLKSRC_NPS)	+= timer-nps.o
  obj-$(CONFIG_OXNAS_RPS_TIMER)	+= timer-oxnas-rps.o
 -obj-$(CONFIG_OWL_TIMER)		+= owl-timer.o
 +obj-$(CONFIG_OWL_TIMER)		+= timer-owl.o
  obj-$(CONFIG_SPRD_TIMER)	+= timer-sprd.o
  obj-$(CONFIG_NPCM7XX_TIMER)	+= timer-npcm7xx.o
  
@@@ -66,7 -66,7 +66,7 @@@ obj-$(CONFIG_ARM_TIMER_SP804)		+= timer
  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
 -obj-$(CONFIG_CLKSRC_VERSATILE)		+= versatile.o
 +obj-$(CONFIG_CLKSRC_VERSATILE)		+= timer-versatile.o
  obj-$(CONFIG_CLKSRC_MIPS_GIC)		+= mips-gic-timer.o
  obj-$(CONFIG_CLKSRC_TANGO_XTAL)		+= tango_xtal.o
  obj-$(CONFIG_CLKSRC_IMX_GPT)		+= timer-imx-gpt.o
@@@ -79,3 -79,5 +79,5 @@@ obj-$(CONFIG_CLKSRC_ST_LPC)		+= clksrc_
  obj-$(CONFIG_X86_NUMACHIP)		+= numachip.o
  obj-$(CONFIG_ATCPIT100_TIMER)		+= timer-atcpit100.o
  obj-$(CONFIG_RISCV_TIMER)		+= riscv_timer.o
+ obj-$(CONFIG_CSKY_MP_TIMER)		+= timer-mp-csky.o
+ obj-$(CONFIG_GX6605S_TIMER)		+= timer-gx6605s.o