[PATCH v3 7/7] pinctrl: ingenic: Handle X2600 Port E pull configuration
From: H. Nikolaus Schaller
Date: Wed Nov 18 2026 - 02:42:34 EST
Port E uses PEPE as pull enable and PEPS as pull direction
selection, unlike ports A-D with independent pull registers.
Update both pinconf get and set while leaving other ports unchanged.
Signed-off-by: H. Nikolaus Schaller <hns@xxxxxxxxxxxxx>
---
drivers/pinctrl/pinctrl-ingenic.c | 33 ++++++++++++++++++++++++++++---
1 file changed, 30 insertions(+), 3 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-ingenic.c b/drivers/pinctrl/pinctrl-ingenic.c
index 0491b135c1d11..2c8006280b943 100644
--- a/drivers/pinctrl/pinctrl-ingenic.c
+++ b/drivers/pinctrl/pinctrl-ingenic.c
@@ -4637,7 +4637,16 @@ static int ingenic_pinconf_get(struct pinctrl_dev *pctldev,
unsigned int bias, reg;
bool pull, pullup, pulldown;
- if (is_soc_or_above(jzpc, ID_X2000)) {
+ if (is_soc(jzpc, ID_X2600) && offt == 4) {
+ pull = ingenic_get_pin_config(jzpc, pin, X2000_GPIO_PEPU);
+ pullup = pull &&
+ ingenic_get_pin_config(jzpc, pin, X2000_GPIO_PEPD) &&
+ (jzpc->info->pull_ups[offt] & BIT(idx));
+ pulldown = pull &&
+ !ingenic_get_pin_config(jzpc, pin, X2000_GPIO_PEPD) &&
+ (jzpc->info->pull_downs[offt] & BIT(idx));
+
+ } else if (is_soc_or_above(jzpc, ID_X2000)) {
pullup = ingenic_get_pin_config(jzpc, pin, X2000_GPIO_PEPU) &&
!ingenic_get_pin_config(jzpc, pin, X2000_GPIO_PEPD) &&
(jzpc->info->pull_ups[offt] & BIT(idx));
@@ -4706,7 +4715,7 @@ static int ingenic_pinconf_get(struct pinctrl_dev *pctldev,
if (is_soc(jzpc, ID_X2600) &&
pin / PINS_PER_GPIO_CHIP == 4)
arg |= !!ingenic_get_pin_config(jzpc, pin,
- X2600_GPIO_SMT1);
+ X2600_GPIO_SMT1);
break;
case PIN_CONFIG_SLEW_RATE:
@@ -4731,7 +4740,25 @@ static int ingenic_pinconf_get(struct pinctrl_dev *pctldev,
static void ingenic_set_bias(struct ingenic_pinctrl *jzpc,
unsigned int pin, unsigned int bias)
{
- if (is_soc_or_above(jzpc, ID_X2000)) {
+ if (is_soc(jzpc, ID_X2600) && pin / PINS_PER_GPIO_CHIP == 4) {
+ /* X2600 Port E: PEPS selects direction, PEPE enables pull */
+ switch (bias) {
+ case GPIO_PULL_UP:
+ ingenic_config_pin(jzpc, pin, X2000_GPIO_PEPD, true);
+ ingenic_config_pin(jzpc, pin, X2000_GPIO_PEPU, true);
+ break;
+
+ case GPIO_PULL_DOWN:
+ ingenic_config_pin(jzpc, pin, X2000_GPIO_PEPD, false);
+ ingenic_config_pin(jzpc, pin, X2000_GPIO_PEPU, true);
+ break;
+
+ case GPIO_PULL_DIS:
+ default:
+ ingenic_config_pin(jzpc, pin, X2000_GPIO_PEPU, false);
+ break;
+ }
+ } else if (is_soc_or_above(jzpc, ID_X2000)) {
switch (bias) {
case GPIO_PULL_UP:
ingenic_config_pin(jzpc, pin, X2000_GPIO_PEPD, false);
--
2.56.0