Commit 7a932e57 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'asm-generic-timers-5.11' of... 

Merge tag 'asm-generic-timers-5.11' of git://git.kernel.org/pub/scm/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
parents 15780712 0774a6ed

Documentation/features/time/clockevents/arch-support.txt

+4 −4
Original line number Diff line number Diff line 
#

# Feature name:          clockevents

#         Kconfig:       GENERIC_CLOCKEVENTS

#         Kconfig:       !LEGACY_TIMER_TICK

#         description:   arch support generic clock events

#

    -----------------------
@@ -8,20 +8,20 @@ 
    -----------------------

    |       alpha: |  ok  |

    |         arc: |  ok  |

    |         arm: |  ok  |

    |         arm: | TODO |

    |       arm64: |  ok  |

    |         c6x: |  ok  |

    |        csky: |  ok  |

    |       h8300: |  ok  |

    |     hexagon: |  ok  |

    |        ia64: | TODO |

    |        m68k: |  ok  |

    |        m68k: | TODO |

    |  microblaze: |  ok  |

    |        mips: |  ok  |

    |       nds32: |  ok  |

    |       nios2: |  ok  |

    |    openrisc: |  ok  |

    |      parisc: |  ok  |

    |      parisc: | TODO |

    |     powerpc: |  ok  |

    |       riscv: |  ok  |

    |        s390: |  ok  |

Documentation/features/time/modern-timekeeping/arch-support.txt

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
#

# Feature name:          modern-timekeeping

#         Kconfig:       !ARCH_USES_GETTIMEOFFSET

#         description:   arch does not use arch_gettimeoffset() anymore

#

    -----------------------

    |         arch |status|

    -----------------------

    |       alpha: |  ok  |

    |         arc: |  ok  |

    |         arm: | TODO |

    |       arm64: |  ok  |

    |         c6x: |  ok  |

    |        csky: |  ok  |

    |       h8300: |  ok  |

    |     hexagon: |  ok  |

    |        ia64: |  ok  |

    |        m68k: |  ok  |

    |  microblaze: |  ok  |

    |        mips: |  ok  |

    |       nds32: |  ok  |

    |       nios2: |  ok  |

    |    openrisc: |  ok  |

    |      parisc: |  ok  |

    |     powerpc: |  ok  |

    |       riscv: |  ok  |

    |        s390: |  ok  |

    |          sh: |  ok  |

    |       sparc: |  ok  |

    |          um: |  ok  |

    |         x86: |  ok  |

    |      xtensa: |  ok  |

    -----------------------

MAINTAINERS

+0 −8
Original line number Diff line number Diff line
@@ -1799,14 +1799,6 @@ F: drivers/firmware/turris-mox-rwtm.c 
F:	drivers/gpio/gpio-moxtet.c

F:	include/linux/moxtet.h









ARM/EBSA110 MACHINE SUPPORT









M:	Russell King <linux@armlinux.org.uk>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Maintained









W:	http://www.armlinux.org.uk/









F:	arch/arm/mach-ebsa110/









F:	drivers/net/ethernet/amd/am79c961a.*

















ARM/ENERGY MICRO (SILICON LABS) EFM32 SUPPORT









M:	Uwe Kleine-König <u.kleine-koenig@pengutronix.de>









R:	Pengutronix Kernel Team <kernel@pengutronix.de>
































arch/alpha/Kconfig



+0
−1






























Original line number
Diff line number
Diff line







@@ -27,7 +27,6 @@ config ALPHA







	select ARCH_WANT_IPC_PARSE_VERSION









	select ARCH_HAVE_NMI_SAFE_CMPXCHG









	select AUDIT_ARCH









	select GENERIC_CLOCKEVENTS









	select GENERIC_CPU_VULNERABILITIES









	select GENERIC_SMP_IDLE_THREAD









	select GENERIC_STRNCPY_FROM_USER
































arch/arc/Kconfig



+0
−1






























Original line number
Diff line number
Diff line







@@ -19,7 +19,6 @@ config ARC







	select COMMON_CLK









	select DMA_DIRECT_REMAP









	select GENERIC_ATOMIC64 if !ISA_ARCV2 || !(ARC_HAS_LL64 && ARC_HAS_LLSC)









	select GENERIC_CLOCKEVENTS









	select GENERIC_FIND_FIRST_BIT









	# for now, we don't need GENERIC_IRQ_PROBE, CONFIG_GENERIC_IRQ_CHIP









	select GENERIC_IRQ_SHOW








































































CRA Git | Maintained and supported by SUSTech CRA and CCSE