Commit dd08ebe7 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'counter-updates-for-6.3a' of... 

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

William writes:

First set of Counter updates for the 6.3 cycle

This set of updates consists only of Kconfig cleanup and changes for the
Counter subsystem. In particular, the Kconfig entries are reorganized to
to alphabetical order, and dependencies added to restrict building
certain drivers (intel-qep, ftm-quaddec, and microchip-tcp-capture) to
systems that support them.

Changes
* counter
  - Sort the Kconfig entries alphabetically
* ftm-quaddec
  - Depend on the Layerscape SoC
* microchip-tcp-capture
  - Add appropriate arch deps for TCP driver
  - fix dependency references for config MICROCHIP_TCB_CAPTURE
* intel-qep
  - Depend on X86

* tag 'counter-updates-for-6.3a' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter:
  counter: fix dependency references for config MICROCHIP_TCB_CAPTURE
  counter: microchip-tcp-capture: Add appropriate arch deps for TCP driver
  counter: ftm-quaddec: Depend on the Layerscape SoC
  counter: intel-qep: Depend on X86
  counter: Sort the Kconfig entries alphabetically
parents 7c306cb1 01f714ee

drivers/counter/Kconfig

+47 −44
Original line number Diff line number Diff line
@@ -29,6 +29,28 @@ config 104_QUAD_8 
	  array module parameter. The interrupt line numbers for the devices may

	  be configured via the irq array module parameter.



config FTM_QUADDEC

	tristate "Flex Timer Module Quadrature decoder driver"

	depends on SOC_LS1021A || COMPILE_TEST

	depends on HAS_IOMEM && OF

	help

	  Select this option to enable the Flex Timer Quadrature decoder

	  driver.



	  To compile this driver as a module, choose M here: the

	  module will be called ftm-quaddec.



config INTEL_QEP

	tristate "Intel Quadrature Encoder Peripheral driver"

	depends on X86

	depends on PCI

	help

	  Select this option to enable the Intel Quadrature Encoder Peripheral

	  driver.



	  To compile this driver as a module, choose M here: the module

	  will be called intel-qep.



config INTERRUPT_CNT

	tristate "Interrupt counter driver"

	depends on GPIOLIB
@@ -39,15 +61,17 @@ config INTERRUPT_CNT 
	  To compile this driver as a module, choose M here: the

	  module will be called interrupt-cnt.



config STM32_TIMER_CNT

	tristate "STM32 Timer encoder counter driver"

	depends on MFD_STM32_TIMERS || COMPILE_TEST

config MICROCHIP_TCB_CAPTURE

	tristate "Microchip Timer Counter Capture driver"

	depends on SOC_AT91SAM9 || SOC_SAM_V7 || COMPILE_TEST

	depends on HAS_IOMEM && OF

	select REGMAP_MMIO

	help

	  Select this option to enable STM32 Timer quadrature encoder

	  and counter driver.

	  Select this option to enable the Microchip Timer Counter Block

	  capture driver.



	  To compile this driver as a module, choose M here: the

	  module will be called stm32-timer-cnt.

	  module will be called microchip-tcb-capture.



config STM32_LPTIMER_CNT

	tristate "STM32 LP Timer encoder counter driver"
@@ -59,47 +83,15 @@ config STM32_LPTIMER_CNT 
	  To compile this driver as a module, choose M here: the

	  module will be called stm32-lptimer-cnt.



config TI_EQEP

	tristate "TI eQEP counter driver"

	depends on (SOC_AM33XX || COMPILE_TEST)

	select REGMAP_MMIO

	help

	  Select this option to enable the Texas Instruments Enhanced Quadrature

	  Encoder Pulse (eQEP) counter driver.



	  To compile this driver as a module, choose M here: the module will be

	  called ti-eqep.



config FTM_QUADDEC

	tristate "Flex Timer Module Quadrature decoder driver"

	depends on HAS_IOMEM && OF

	help

	  Select this option to enable the Flex Timer Quadrature decoder

	  driver.



	  To compile this driver as a module, choose M here: the

	  module will be called ftm-quaddec.



config MICROCHIP_TCB_CAPTURE

	tristate "Microchip Timer Counter Capture driver"

	depends on HAS_IOMEM && OF

	select REGMAP_MMIO

config STM32_TIMER_CNT

	tristate "STM32 Timer encoder counter driver"

	depends on MFD_STM32_TIMERS || COMPILE_TEST

	help

	  Select this option to enable the Microchip Timer Counter Block

	  capture driver.

	  Select this option to enable STM32 Timer quadrature encoder

	  and counter driver.



	  To compile this driver as a module, choose M here: the

	  module will be called microchip-tcb-capture.



config INTEL_QEP

	tristate "Intel Quadrature Encoder Peripheral driver"

	depends on PCI

	help

	  Select this option to enable the Intel Quadrature Encoder Peripheral

	  driver.



	  To compile this driver as a module, choose M here: the module

	  will be called intel-qep.

	  module will be called stm32-timer-cnt.



config TI_ECAP_CAPTURE

	tristate "TI eCAP capture driver"
@@ -116,4 +108,15 @@ config TI_ECAP_CAPTURE 
	  To compile this driver as a module, choose M here: the module

	  will be called ti-ecap-capture.



config TI_EQEP

	tristate "TI eQEP counter driver"

	depends on (SOC_AM33XX || COMPILE_TEST)

	select REGMAP_MMIO

	help

	  Select this option to enable the Texas Instruments Enhanced Quadrature

	  Encoder Pulse (eQEP) counter driver.



	  To compile this driver as a module, choose M here: the module will be

	  called ti-eqep.



endif # COUNTER