From: "H. Nikolaus Schaller" <hns@goldelico.com>
To: Linus Walleij <linusw@kernel.org>, Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>,
Paul Cercueil <paul@crapouillou.net>,
Bartosz Golaszewski <brgl@kernel.org>
Cc: linux-gpio@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org,
letux-kernel@openphoenux.org,
"H. Nikolaus Schaller" <hns@goldelico.com>,
stable@vger.kernel.org
Subject: [PATCH v4 2/7] pinctrl: ingenic: Fix hardware dual-edge interrupts on X1600
Date: Wed, 18 Nov 2026 18:25:32 +0100 [thread overview]
Message-ID: <12e66f571e8765b1eefeab5939c2c874b71b28af.1795022736.git.hns@goldelico.com> (raw)
In-Reply-To: <cover.1795022736.git.hns@goldelico.com>
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: 4da56f9c6f14 ("pinctrl: ingenic: add x1600 support")
Cc: stable@vger.kernel.org
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
---
Notes:
Changes V4:
- Fix Fixes: and stable Cc trailers.
(suggested by Paul Cercueil and Sashiko-Bot)
- Merge the common shadow-register paths and simplify EDG handling.
(suggested by Paul Cercueil)
- Retested hardware dual-edge interrupts on X1600/X2000 after the
shadow-register refactoring. Verified both button transitions
with evtest and confirmed via devmem2 that PAT1, PAT0 and EDG
remain unchanged across GPIO input transitions.
drivers/pinctrl/pinctrl-ingenic.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-ingenic.c b/drivers/pinctrl/pinctrl-ingenic.c
index 88c5edeaaddcc..7f65f3abf05f5 100644
--- a/drivers/pinctrl/pinctrl-ingenic.c
+++ b/drivers/pinctrl/pinctrl-ingenic.c
@@ -3601,7 +3601,8 @@ static void irq_set_type(struct ingenic_gpio_chip *jzgc,
switch (type) {
case IRQ_TYPE_EDGE_BOTH:
- val1 = val2 = false;
+ val1 = false;
+ val2 = is_soc_or_above(jzgc->jzpc, ID_X1600);
val3 = true;
break;
case IRQ_TYPE_EDGE_RISING:
@@ -3635,15 +3636,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);
} else {
ingenic_gpio_set_bit(jzgc, reg2, offset, val1);
ingenic_gpio_set_bit(jzgc, reg1, offset, val2);
@@ -3718,7 +3717,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 +3757,7 @@ 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)) {
/*
* The hardware does not support interrupts on both edges. The
* best we can do is to set up a single-edge interrupt and then
--
2.56.0
next prev parent reply other threads:[~2026-11-18 17:25 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-18 17:25 [PATCH v4 0/7] pinctrl: ingenic: Add X2600 support H. Nikolaus Schaller
2026-11-18 17:25 ` [PATCH v4 1/7] pinctrl: ingenic: Swap ID_X1600 and ID_X1830 H. Nikolaus Schaller
2026-11-18 17:25 ` H. Nikolaus Schaller [this message]
2026-11-18 17:25 ` [PATCH v4 3/7] dt-bindings: pinctrl: ingenic: Add X2600 support H. Nikolaus Schaller
2026-11-18 17:25 ` [PATCH v4 4/7] pinctrl: ingenic: Add X2600 register and GPIO IRQ support H. Nikolaus Schaller
2026-11-18 17:25 ` [PATCH v4 5/7] pinctrl: ingenic: Add X2600 pin groups and functions H. Nikolaus Schaller
2026-11-18 17:25 ` [PATCH v4 6/7] pinctrl: ingenic: Handle X2600 Port E Schmitt trigger H. Nikolaus Schaller
2026-11-18 17:25 ` [PATCH v4 7/7] pinctrl: ingenic: Handle X2600 Port E pull configuration H. Nikolaus Schaller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=12e66f571e8765b1eefeab5939c2c874b71b28af.1795022736.git.hns@goldelico.com \
--to=hns@goldelico.com \
--cc=brgl@kernel.org \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=krzk+dt@kernel.org \
--cc=letux-kernel@openphoenux.org \
--cc=linusw@kernel.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=paul@crapouillou.net \
--cc=robh@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®