Skip to content

Commit 8be586f

Browse files
author
Linus Walleij
committed
Revert "pinctrl: tegra: Add support to display pin function"
This reverts commit d1cd5b5. It was reported that some I2C3 functions stop working after this patch, and it is just debug help so let's revert it and investigate. Link: https://lore.kernel.org/linux-gpio/20230925183049.10a40546@booty/ Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
1 parent c153a4e commit 8be586f

2 files changed

Lines changed: 2 additions & 19 deletions

File tree

drivers/pinctrl/tegra/pinctrl-tegra.c

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ static const struct cfg_param {
9696
{"nvidia,slew-rate-falling", TEGRA_PINCONF_PARAM_SLEW_RATE_FALLING},
9797
{"nvidia,slew-rate-rising", TEGRA_PINCONF_PARAM_SLEW_RATE_RISING},
9898
{"nvidia,drive-type", TEGRA_PINCONF_PARAM_DRIVE_TYPE},
99-
{"nvidia,function", TEGRA_PINCONF_PARAM_FUNCTION},
10099
};
101100

102101
static int tegra_pinctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
@@ -471,12 +470,6 @@ static int tegra_pinconf_reg(struct tegra_pmx *pmx,
471470
*bit = g->drvtype_bit;
472471
*width = 2;
473472
break;
474-
case TEGRA_PINCONF_PARAM_FUNCTION:
475-
*bank = g->mux_bank;
476-
*reg = g->mux_reg;
477-
*bit = g->mux_bit;
478-
*width = 2;
479-
break;
480473
default:
481474
dev_err(pmx->dev, "Invalid config param %04x\n", param);
482475
return -ENOTSUPP;
@@ -640,16 +633,8 @@ static void tegra_pinconf_group_dbg_show(struct pinctrl_dev *pctldev,
640633
val >>= bit;
641634
val &= (1 << width) - 1;
642635

643-
if (cfg_params[i].param == TEGRA_PINCONF_PARAM_FUNCTION) {
644-
u8 idx = pmx->soc->groups[group].funcs[val];
645-
646-
seq_printf(s, "\n\t%s=%s",
647-
strip_prefix(cfg_params[i].property),
648-
pmx->functions[idx].name);
649-
} else {
650-
seq_printf(s, "\n\t%s=%u",
651-
strip_prefix(cfg_params[i].property), val);
652-
}
636+
seq_printf(s, "\n\t%s=%u",
637+
strip_prefix(cfg_params[i].property), val);
653638
}
654639
}
655640

drivers/pinctrl/tegra/pinctrl-tegra.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@ enum tegra_pinconf_param {
5454
TEGRA_PINCONF_PARAM_SLEW_RATE_RISING,
5555
/* argument: Integer, range is HW-dependant */
5656
TEGRA_PINCONF_PARAM_DRIVE_TYPE,
57-
/* argument: pinmux settings */
58-
TEGRA_PINCONF_PARAM_FUNCTION,
5957
};
6058

6159
enum tegra_pinconf_pull {

0 commit comments

Comments
 (0)