Merge tag 'counter-fixes-for-6.18' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/wbg/counter into char-misc-next

gregkh · gregkh · commit 76992675d7bc · 2025-10-28T14:41:55.000+01:00
William writes:

Counter fixes for 6.18

A fix to permit multiple counter channels to share the same TCB IRQ line
for microchip-tcb-cpature.

* tag 'counter-fixes-for-6.18' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/wbg/counter:
  counter: microchip-tcb-capture: Allow shared IRQ for multi-channel TCBs
diff --git a/drivers/counter/microchip-tcb-capture.c b/drivers/counter/microchip-tcb-capture.c
@@ -451,7 +451,7 @@ static void mchp_tc_irq_remove(void *ptr)
 static int mchp_tc_irq_enable(struct counter_device *const counter, int irq)
 {
 	struct mchp_tc_data *const priv = counter_priv(counter);
-	int ret = devm_request_irq(counter->parent, irq, mchp_tc_isr, 0,
+	int ret = devm_request_irq(counter->parent, irq, mchp_tc_isr, IRQF_SHARED,
 				   dev_name(counter->parent), counter);
 
 	if (ret < 0)

Original file line number	Diff line number	Diff line change
`@@ -451,7 +451,7 @@ static void mchp_tc_irq_remove(void *ptr)`
`451`	`451`	`static int mchp_tc_irq_enable(struct counter_device *const counter, int irq)`
`452`	`452`	`{`
`453`	`453`	`struct mchp_tc_data *const priv = counter_priv(counter);`
`454`		`- int ret = devm_request_irq(counter->parent, irq, mchp_tc_isr, 0,`
	`454`	`+ int ret = devm_request_irq(counter->parent, irq, mchp_tc_isr, IRQF_SHARED,`
`455`	`455`	`dev_name(counter->parent), counter);`
`456`	`456`
`457`	`457`	`if (ret < 0)`