From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 15 Jun 2023 11:07:59 +0000 (+0200)
Subject: Merge tag 'counter-updates-for-6.5a' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e04b1bff338255777a5a2ba70ec907d52b8e7c8a;p=linux.git

Merge tag 'counter-updates-for-6.5a' of git://git./linux/kernel/git/wbg/counter into char-misc-next

William writes:

First set of Counter updates for the 6.5 cycle

Biggest changes in this set include the introduction of a new Intel 8254
interface library module and the refactoring of the existing 104-quad-8
modules to migrate it to the regmap API. Some other minor cleanups
touching tools/counter and stm32-timer-cnt are also present.

Changes
* 104-quad-8
  - Remove reference in Kconfig to 25-bit counter value
  - Utilize bitfield access macros
  - Refactor to buffer states for CMR, IOR, and IDR
  - Utilize helper functions to handle PR, FLAG and PSC
  - Migrate to the regmap API
* i8254
  - Introduce the Intel 8254 interface library module
* stm32-timer-cnt
  - Reset TIM_TISEL to its default value in probe
* tools/counter
  - Add .gitignore
  - Remove lingering 'include' directories on make clean

* tag 'counter-updates-for-6.5a' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter:
  counter: i8254: Introduce the Intel 8254 interface library module
  counter: 104-quad-8: Migrate to the regmap API
  counter: 104-quad-8: Utilize helper functions to handle PR, FLAG and PSC
  counter: 104-quad-8: Refactor to buffer states for CMR, IOR, and IDR
  counter: 104-quad-8: Utilize bitfield access macros
  tools/counter: Makefile: Remove lingering 'include' directories on make clean
  tools/counter: Add .gitignore
  counter: stm32-timer-cnt: Reset TIM_TISEL to its default value in probe
  counter: 104-quad-8: Remove reference in Kconfig to 25-bit counter value
---

e04b1bff338255777a5a2ba70ec907d52b8e7c8a
diff --cc drivers/counter/Kconfig
index e65a2bf178b85,a61a4b9b8ec6d..bca21df511686
--- a/drivers/counter/Kconfig
+++ b/drivers/counter/Kconfig
@@@ -15,8 -30,8 +30,9 @@@ if COUNTE
  config 104_QUAD_8
  	tristate "ACCES 104-QUAD-8 driver"
  	depends on (PC104 && X86) || COMPILE_TEST
 +	depends on HAS_IOPORT_MAP
  	select ISA_BUS_API
+ 	select REGMAP_MMIO
  	help
  	  Say yes here to build support for the ACCES 104-QUAD-8 quadrature
  	  encoder counter/interface device family (104-QUAD-8, 104-QUAD-4).