[PATCH v3 1/7] pinctrl: ingenic: Swap ID_X1600 and ID_X1830
From: H. Nikolaus Schaller
Date: Wed Nov 18 2026 - 02:42:28 EST
From: Paul Cercueil <paul@xxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxx>
Signed-off-by: H. Nikolaus Schaller <hns@xxxxxxxxxxxxx>
---
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