From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 16 Dec 2020 08:07:17 +0000 (-0800)
Subject: Merge tag 'asm-generic-timers-5.11' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.15~2183
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7a932e5702886e872a545d64605c06a51ee17973;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'asm-generic-timers-5.11' of git://git./linux/kernel/git/arnd/asm-generic

Pull asm-generic cross-architecture timer cleanup from Arnd Bergmann:
 "This cleans up two ancient timer features that were never completed in
  the past, CONFIG_GENERIC_CLOCKEVENTS and CONFIG_ARCH_USES_GETTIMEOFFSET.

  There was only one user left for the ARCH_USES_GETTIMEOFFSET variant
  of clocksource implementations, the ARM EBSA110 platform. Rather than
  changing to use modern timekeeping, we remove the platform entirely as
  Russell no longer uses his machine and nobody else seems to have one
  any more.

  The conditional code for using arch_gettimeoffset() is removed as a
  result.

  For CONFIG_GENERIC_CLOCKEVENTS, there are still a couple of platforms
  not using clockevent drivers: parisc, ia64, most of m68k, and one Arm
  platform. These all do timer ticks slighly differently, and this gets
  cleaned up to the point they at least all call the same helper
  function.

  Instead of most platforms using 'select GENERIC_CLOCKEVENTS' in
  Kconfig, the polarity is now reversed, with the few remaining ones
  selecting LEGACY_TIMER_TICK instead"

* tag 'asm-generic-timers-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  timekeeping: default GENERIC_CLOCKEVENTS to enabled
  timekeeping: remove xtime_update
  m68k: remove timer_interrupt() function
  m68k: change remaining timers to legacy_timer_tick
  m68k: m68328: use legacy_timer_tick()
  m68k: sun3/sun3c: use legacy_timer_tick
  m68k: split heartbeat out of timer function
  m68k: coldfire: use legacy_timer_tick()
  parisc: use legacy_timer_tick
  ARM: rpc: use legacy_timer_tick
  ia64: convert to legacy_timer_tick
  timekeeping: add CONFIG_LEGACY_TIMER_TICK
  timekeeping: remove arch_gettimeoffset
  net: remove am79c961a driver
  ARM: remove ebsa110 platform
---

7a932e5702886e872a545d64605c06a51ee17973
diff --cc arch/m68k/Kconfig.machine
index 054ff63,b47ac37..cf6961d
--- a/arch/m68k/Kconfig.machine
+++ b/arch/m68k/Kconfig.machine
@@@ -28,11 -30,14 +30,12 @@@ config MA
  	depends on MMU
  	select MMU_MOTOROLA if MMU
  	select HAVE_ARCH_NVRAM_OPS
+ 	select LEGACY_TIMER_TICK
  	help
  	  This option enables support for the Apple Macintosh series of
 -	  computers (yes, there is experimental support now, at least for part
 -	  of the series).
 -
 -	  Say N unless you're willing to code the remaining necessary support.
 -	  ;)
 +	  computers. If you plan to use this kernel on a Mac, say Y here and
 +	  browse the documentation available at <http://www.mac.linux-m68k.org/>;
 +	  otherwise say N.
  
  config APOLLO
  	bool "Apollo support"
diff --cc arch/m68k/mac/config.c
index e239d2d,0dbe0fe..1cdac95
--- a/arch/m68k/mac/config.c
+++ b/arch/m68k/mac/config.c
@@@ -55,9 -55,10 +55,9 @@@ struct mac_booter_data mac_bi_data
  static unsigned long mac_orig_videoaddr;
  
  extern int mac_hwclk(int, struct rtc_time *);
 -extern void iop_preinit(void);
  extern void iop_init(void);
  extern void via_init(void);
- extern void via_init_clock(irq_handler_t func);
+ extern void via_init_clock(void);
  extern void oss_init(void);
  extern void psc_init(void);
  extern void baboon_init(void);