From 9c5e51f2b01edc5b3057044d15eb0f57be2cd449 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 8 Jan 2023 07:47:47 +0000 Subject: [PATCH 1/5] counter: Sort the Kconfig entries alphabetically Sort the Kconfig menu alphabetically to make it easier to read as the list grows larger. Signed-off-by: Peter Robinson Link: https://lore.kernel.org/r/20230108074750.443705-1-pbrobinson@gmail.com/ Signed-off-by: William Breathitt Gray --- drivers/counter/Kconfig | 96 ++++++++++++++++++++--------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/drivers/counter/Kconfig b/drivers/counter/Kconfig index d388bf26f4dc..508d857808e9 100644 --- a/drivers/counter/Kconfig +++ b/drivers/counter/Kconfig @@ -29,47 +29,6 @@ config 104_QUAD_8 array module parameter. The interrupt line numbers for the devices may be configured via the irq array module parameter. -config INTERRUPT_CNT - tristate "Interrupt counter driver" - depends on GPIOLIB - help - Select this option to enable interrupt counter driver. Any interrupt - source can be used by this driver as the event source. - - 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 - help - 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 stm32-timer-cnt. - -config STM32_LPTIMER_CNT - tristate "STM32 LP Timer encoder counter driver" - depends on MFD_STM32_LPTIMER || COMPILE_TEST - help - Select this option to enable STM32 Low-Power Timer quadrature encoder - and counter driver. - - 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 @@ -80,6 +39,26 @@ config FTM_QUADDEC 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 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 + help + Select this option to enable interrupt counter driver. Any interrupt + source can be used by this driver as the event source. + + To compile this driver as a module, choose M here: the + module will be called interrupt-cnt. + config MICROCHIP_TCB_CAPTURE tristate "Microchip Timer Counter Capture driver" depends on HAS_IOMEM && OF @@ -91,15 +70,25 @@ config MICROCHIP_TCB_CAPTURE 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 +config STM32_LPTIMER_CNT + tristate "STM32 LP Timer encoder counter driver" + depends on MFD_STM32_LPTIMER || COMPILE_TEST help - Select this option to enable the Intel Quadrature Encoder Peripheral - driver. + Select this option to enable STM32 Low-Power Timer quadrature encoder + and counter driver. - To compile this driver as a module, choose M here: the module - will be called intel-qep. + To compile this driver as a module, choose M here: the + module will be called stm32-lptimer-cnt. + +config STM32_TIMER_CNT + tristate "STM32 Timer encoder counter driver" + depends on MFD_STM32_TIMERS || COMPILE_TEST + help + 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 stm32-timer-cnt. config TI_ECAP_CAPTURE tristate "TI eCAP capture driver" @@ -116,4 +105,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 From 92a3337081e55eee0491b2a0255a45e7f583fff6 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 8 Jan 2023 07:47:48 +0000 Subject: [PATCH 2/5] counter: intel-qep: Depend on X86 Limit the Intel counter driver to X86, it doesn't make sense to build it for all arches if the counter subsystem is enabled. Signed-off-by: Peter Robinson Link: https://lore.kernel.org/r/20230108074750.443705-2-pbrobinson@gmail.com/ Signed-off-by: William Breathitt Gray --- drivers/counter/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/counter/Kconfig b/drivers/counter/Kconfig index 508d857808e9..011e6af840fc 100644 --- a/drivers/counter/Kconfig +++ b/drivers/counter/Kconfig @@ -41,6 +41,7 @@ config 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 From 3760b49af5bc773a1679cd2e9dbef3c2532726af Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 8 Jan 2023 07:47:49 +0000 Subject: [PATCH 3/5] counter: ftm-quaddec: Depend on the Layerscape SoC At the moment only the Freescale LS1021A is the only HW that supports this IP block so add an appropriate dependency and compile test. Signed-off-by: Peter Robinson Link: https://lore.kernel.org/r/20230108074750.443705-3-pbrobinson@gmail.com/ Signed-off-by: William Breathitt Gray --- drivers/counter/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/counter/Kconfig b/drivers/counter/Kconfig index 011e6af840fc..ef78386ccd2e 100644 --- a/drivers/counter/Kconfig +++ b/drivers/counter/Kconfig @@ -31,6 +31,7 @@ config 104_QUAD_8 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 From dfeef15e73ca22455c1dd51c0ebc477145081630 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 8 Jan 2023 07:47:50 +0000 Subject: [PATCH 4/5] counter: microchip-tcp-capture: Add appropriate arch deps for TCP driver Add the CONFIG_SOC_AT91SAM9 and CONFIG_SOC_SAM_V7 deps for the Microchip SoCs that support this IP block/driver plus compile time testing. Signed-off-by: Peter Robinson Link: https://lore.kernel.org/r/20230108074750.443705-4-pbrobinson@gmail.com/ Signed-off-by: William Breathitt Gray --- drivers/counter/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/counter/Kconfig b/drivers/counter/Kconfig index ef78386ccd2e..90602536fb13 100644 --- a/drivers/counter/Kconfig +++ b/drivers/counter/Kconfig @@ -63,6 +63,7 @@ config INTERRUPT_CNT config MICROCHIP_TCB_CAPTURE tristate "Microchip Timer Counter Capture driver" + depends on CONFIG_SOC_AT91SAM9 || CONFIG_SOC_SAM_V7 || COMPILE_TEST depends on HAS_IOMEM && OF select REGMAP_MMIO help From 01f714ee022ecb2667ca8ba909138b1af4cfff2c Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Wed, 18 Jan 2023 08:46:59 +0100 Subject: [PATCH 5/5] counter: fix dependency references for config MICROCHIP_TCB_CAPTURE Commit dfeef15e73ca ("counter: microchip-tcp-capture: Add appropriate arch deps for TCP driver") intends to add appropriate dependencies for the config MICROCHIP_TCB_CAPTURE. It however prefixes the intended configs with CONFIG, but in Kconfig files in contrast to source files, the configs are referenced to without prefixing them with CONFIG. Fix the dependency references due to this minor misconception. Fixes: dfeef15e73ca ("counter: microchip-tcp-capture: Add appropriate arch deps for TCP driver") Signed-off-by: Lukas Bulwahn Link: https://lore.kernel.org/r/20230118074659.5909-1-lukas.bulwahn@gmail.com/ Signed-off-by: William Breathitt Gray --- drivers/counter/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/counter/Kconfig b/drivers/counter/Kconfig index 90602536fb13..b5ba8fb02cf7 100644 --- a/drivers/counter/Kconfig +++ b/drivers/counter/Kconfig @@ -63,7 +63,7 @@ config INTERRUPT_CNT config MICROCHIP_TCB_CAPTURE tristate "Microchip Timer Counter Capture driver" - depends on CONFIG_SOC_AT91SAM9 || CONFIG_SOC_SAM_V7 || COMPILE_TEST + depends on SOC_AT91SAM9 || SOC_SAM_V7 || COMPILE_TEST depends on HAS_IOMEM && OF select REGMAP_MMIO help