Re: [PATCH v3 2/7] pinctrl: ingenic: Fix hardware dual-edge interrupts on X1600
From: H. Nikolaus Schaller
Date: Wed Nov 18 2026 - 04:19:25 EST
Hi Paul,
> Am 18.11.2026 um 10:13 schrieb Paul Cercueil <paul@xxxxxxxxxxxxxxx>:
>
> Hi Nikolaus,
>
> Le mercredi 18 novembre 2026 à 08:41 +0100, H. Nikolaus Schaller a écrit :
>> Use the hardware dual-edge detector on X1600 and X2000.
>>
>> Set PAT1 when configuring both edges and program EDG on X1600.
>> Keep software edge switching for older SoCs without EDG.
>>
>> Tested on X1600 and X2000 using GPIO buttons and register readback.
>>
>> Fixes: 943e0da15370 ("pinctrl: Ingenic: Add pinctrl driver for X2000.")
>> Fixes: 4da56f9c6f14 ("pinctrl: ingenic: add x1600 support")
>
> You'll have to decide, I don't think you can have two Fixes: lines.
Ah, sorry. I thought I had it removed... I think we should fix only 4da56f9c6f14
>
> You also need to add:
> Cc: stable@xxxxxxxxxxxxxxx
Agreed.
>
>> Signed-off-by: H. Nikolaus Schaller <hns@xxxxxxxxxxxxx>
>> ---
>> drivers/pinctrl/pinctrl-ingenic.c | 19 +++++++++++--------
>> 1 file changed, 11 insertions(+), 8 deletions(-)
>>
>> diff --git a/drivers/pinctrl/pinctrl-ingenic.c b/drivers/pinctrl/pinctrl-
>> ingenic.c
>> index 88c5edeaaddcc..dc5d38c16e18d 100644
>> --- a/drivers/pinctrl/pinctrl-ingenic.c
>> +++ b/drivers/pinctrl/pinctrl-ingenic.c
>> @@ -3622,6 +3622,10 @@ static void irq_set_type(struct ingenic_gpio_chip
>> *jzgc,
>> break;
>> }
>>
>> + if (type == IRQ_TYPE_EDGE_BOTH &&
>> + is_soc_or_above(jzgc->jzpc, ID_X1600))
>
> That actually fits in one line of 80 chars.
>
> But you can do even better and move that to the switch above, and replace the
> val1 = val2 = false;
>
> with:
> val1 = false;
> val2 = is_soc_or_above(jzgc->jzpc, ID_X1600);
Looks good.
>
>> + val2 = true;
>> +
>> if (is_soc_or_above(jzgc->jzpc, ID_JZ4770)) {
>> reg1 = JZ4770_GPIO_PAT1;
>> reg2 = JZ4770_GPIO_PAT0;
>> @@ -3635,15 +3639,13 @@ static void irq_set_type(struct ingenic_gpio_chip
>> *jzgc,
>> return;
>> }
>>
>> - if (is_soc_or_above(jzgc->jzpc, ID_X2000)) {
>> - ingenic_gpio_shadow_set_bit(jzgc, reg2, offset, val1);
>> - ingenic_gpio_shadow_set_bit(jzgc, reg1, offset, val2);
>> - ingenic_gpio_shadow_set_bit_load(jzgc);
>> - ingenic_gpio_set_bit(jzgc, X2000_GPIO_EDG, offset, val3);
>> - } else if (is_soc_or_above(jzgc->jzpc, ID_X1000)) {
>> + if (is_soc_or_above(jzgc->jzpc, ID_X1000)) {
>> ingenic_gpio_shadow_set_bit(jzgc, reg2, offset, val1);
>> ingenic_gpio_shadow_set_bit(jzgc, reg1, offset, val2);
>> ingenic_gpio_shadow_set_bit_load(jzgc);
>> +
>> + if (is_soc_or_above(jzgc->jzpc, ID_X1600))
>> + ingenic_gpio_set_bit(jzgc, X2000_GPIO_EDG, offset,
>> val3);
>
> The minimal diff would have been to change the check for ID_X2000 to ID_X1600
> above. But the code does look better this way so I take it.
>
>> } else {
>> ingenic_gpio_set_bit(jzgc, reg2, offset, val1);
>> ingenic_gpio_set_bit(jzgc, reg1, offset, val2);
>> @@ -3718,7 +3720,7 @@ static void ingenic_gpio_irq_ack(struct irq_data *irqd)
>> bool high;
>>
>> if ((irqd_get_trigger_type(irqd) == IRQ_TYPE_EDGE_BOTH) &&
>> - !is_soc_or_above(jzgc->jzpc, ID_X2000)) {
>> + !is_soc_or_above(jzgc->jzpc, ID_X1600)) {
>> /*
>> * Switch to an interrupt for the opposite edge to the one
>> that
>> * triggered the interrupt being ACKed.
>> @@ -3758,7 +3760,8 @@ static int ingenic_gpio_irq_set_type(struct irq_data
>> *irqd, unsigned int type)
>> irq_set_handler_locked(irqd, handle_bad_irq);
>> }
>>
>> - if ((type == IRQ_TYPE_EDGE_BOTH) && !is_soc_or_above(jzgc->jzpc,
>> ID_X2000)) {
>> + if (type == IRQ_TYPE_EDGE_BOTH &&
>> + !is_soc_or_above(jzgc->jzpc, ID_X1600)) {
>
> Keep it on line line.
Ok.
V4 will come asap...
>
> Cheers,
> -Paul
BR and thanks,
Nikolaus