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>
Subject: [PATCH v2 1/7] pinctrl: ingenic: Swap ID_X1600 and ID_X1830
Date: Tue, 17 Nov 2026 19:29:22 +0100 [thread overview]
Message-ID: <31af98bb343c39b76f8c59d247a9ebf45ddfb541.1794940167.git.hns@goldelico.com> (raw)
In-Reply-To: <cover.1794940166.git.hns@goldelico.com>
From: Paul Cercueil <paul@crapouillou.net>
The X1830 predates the X1600 and uses an older GPIO register layout.
Swap their IDs to reflect the hardware evolution. This allows
is_soc_or_above() to distinguish newer X1600-based GPIO features
like X2000 (and X2600) from the X1830 register layout.
Add an is_soc() helper for features specific to a single SoC
generation and adjust the existing pin configuration checks
accordingly.
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
---
drivers/pinctrl/pinctrl-ingenic.c | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-ingenic.c b/drivers/pinctrl/pinctrl-ingenic.c
index 37310d9679457..88c5edeaaddcc 100644
--- a/drivers/pinctrl/pinctrl-ingenic.c
+++ b/drivers/pinctrl/pinctrl-ingenic.c
@@ -110,8 +110,8 @@ enum jz_version {
ID_JZ4780,
ID_X1000,
ID_X1500,
- ID_X1600,
ID_X1830,
+ ID_X1600,
ID_X2000,
ID_X2100,
};
@@ -166,6 +166,12 @@ static const unsigned long enabled_socs =
IS_ENABLED(CONFIG_MACH_X2000) << ID_X2000 |
IS_ENABLED(CONFIG_MACH_X2100) << ID_X2100;
+static bool
+is_soc(const struct ingenic_pinctrl *jzpc, enum jz_version version)
+{
+ return (enabled_socs & BIT(version)) && jzpc->info->version == version;
+}
+
static bool
is_soc_or_above(const struct ingenic_pinctrl *jzpc, enum jz_version version)
{
@@ -4090,7 +4096,7 @@ static int ingenic_pinconf_get(struct pinctrl_dev *pctldev,
!ingenic_get_pin_config(jzpc, pin, X2000_GPIO_PEPU) &&
(jzpc->info->pull_downs[offt] & BIT(idx));
- } else if (is_soc_or_above(jzpc, ID_X1830)) {
+ } else if (is_soc(jzpc, ID_X1830)) {
unsigned int half = PINS_PER_GPIO_CHIP / 2;
unsigned int idxh = (pin % half) * 2;
@@ -4142,7 +4148,7 @@ static int ingenic_pinconf_get(struct pinctrl_dev *pctldev,
case PIN_CONFIG_INPUT_SCHMITT_ENABLE:
if (is_soc_or_above(jzpc, ID_X2000))
reg = X2000_GPIO_SMT;
- else if (is_soc_or_above(jzpc, ID_X1830))
+ else if (is_soc(jzpc, ID_X1830))
reg = X1830_GPIO_SMT;
else
return -EINVAL;
@@ -4153,7 +4159,7 @@ static int ingenic_pinconf_get(struct pinctrl_dev *pctldev,
case PIN_CONFIG_SLEW_RATE:
if (is_soc_or_above(jzpc, ID_X2000))
reg = X2000_GPIO_SR;
- else if (is_soc_or_above(jzpc, ID_X1830))
+ else if (is_soc(jzpc, ID_X1830))
reg = X1830_GPIO_SR;
else
return -EINVAL;
@@ -4190,7 +4196,7 @@ static void ingenic_set_bias(struct ingenic_pinctrl *jzpc,
ingenic_config_pin(jzpc, pin, X2000_GPIO_PEPD, false);
}
- } else if (is_soc_or_above(jzpc, ID_X1830)) {
+ } else if (is_soc(jzpc, ID_X1830)) {
unsigned int idx = pin % PINS_PER_GPIO_CHIP;
unsigned int half = PINS_PER_GPIO_CHIP / 2;
unsigned int idxh = (pin % half) * 2;
@@ -4298,7 +4304,7 @@ static int ingenic_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin,
break;
case PIN_CONFIG_INPUT_SCHMITT_ENABLE:
- if (!is_soc_or_above(jzpc, ID_X1830))
+ if (!is_soc(jzpc, ID_X1830) && !is_soc_or_above(jzpc, ID_X2000))
return -EINVAL;
ingenic_set_schmitt_trigger(jzpc, pin, arg);
@@ -4314,7 +4320,7 @@ static int ingenic_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin,
break;
case PIN_CONFIG_SLEW_RATE:
- if (!is_soc_or_above(jzpc, ID_X1830))
+ if (!is_soc(jzpc, ID_X1830) && !is_soc_or_above(jzpc, ID_X2000))
return -EINVAL;
ingenic_set_slew_rate(jzpc, pin, arg);
--
2.56.0
next prev parent reply other threads:[~2026-11-17 18:29 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-17 18:29 [PATCH v2 0/7] pinctrl: ingenic: Add X2600 support H. Nikolaus Schaller
2026-11-17 18:29 ` H. Nikolaus Schaller [this message]
2026-11-17 18:29 ` [PATCH v2 2/7] pinctrl: ingenic: Fix hardware dual-edge interrupts on X1600 H. Nikolaus Schaller
2026-11-17 18:29 ` [PATCH v2 3/7] dt-bindings: pinctrl: ingenic: Add X2600 support H. Nikolaus Schaller
2026-11-17 18:29 ` [PATCH v2 4/7] pinctrl: ingenic: Add X2600 register and GPIO IRQ support H. Nikolaus Schaller
2026-11-17 18:29 ` [PATCH v2 5/7] pinctrl: ingenic: Add X2600 pin groups and functions H. Nikolaus Schaller
2026-11-17 18:29 ` [PATCH v2 6/7] pinctrl: ingenic: Handle X2600 Port E Schmitt trigger H. Nikolaus Schaller
2026-11-17 18:29 ` [PATCH v2 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=31af98bb343c39b76f8c59d247a9ebf45ddfb541.1794940167.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 \
/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®