Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Revert "pinctrl: tegra: Add support to display pin function"

This reverts commit d1cd5b51bc9152dc2b63c5f843590272d6694d50.

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>

+2 -19
+2 -17
drivers/pinctrl/tegra/pinctrl-tegra.c
··· 96 96 {"nvidia,slew-rate-falling", TEGRA_PINCONF_PARAM_SLEW_RATE_FALLING}, 97 97 {"nvidia,slew-rate-rising", TEGRA_PINCONF_PARAM_SLEW_RATE_RISING}, 98 98 {"nvidia,drive-type", TEGRA_PINCONF_PARAM_DRIVE_TYPE}, 99 - {"nvidia,function", TEGRA_PINCONF_PARAM_FUNCTION}, 100 99 }; 101 100 102 101 static int tegra_pinctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev, ··· 470 471 *bit = g->drvtype_bit; 471 472 *width = 2; 472 473 break; 473 - case TEGRA_PINCONF_PARAM_FUNCTION: 474 - *bank = g->mux_bank; 475 - *reg = g->mux_reg; 476 - *bit = g->mux_bit; 477 - *width = 2; 478 - break; 479 474 default: 480 475 dev_err(pmx->dev, "Invalid config param %04x\n", param); 481 476 return -ENOTSUPP; ··· 633 640 val >>= bit; 634 641 val &= (1 << width) - 1; 635 642 636 - if (cfg_params[i].param == TEGRA_PINCONF_PARAM_FUNCTION) { 637 - u8 idx = pmx->soc->groups[group].funcs[val]; 638 - 639 - seq_printf(s, "\n\t%s=%s", 640 - strip_prefix(cfg_params[i].property), 641 - pmx->functions[idx].name); 642 - } else { 643 - seq_printf(s, "\n\t%s=%u", 644 - strip_prefix(cfg_params[i].property), val); 645 - } 643 + seq_printf(s, "\n\t%s=%u", 644 + strip_prefix(cfg_params[i].property), val); 646 645 } 647 646 } 648 647
-2
drivers/pinctrl/tegra/pinctrl-tegra.h
··· 54 54 TEGRA_PINCONF_PARAM_SLEW_RATE_RISING, 55 55 /* argument: Integer, range is HW-dependant */ 56 56 TEGRA_PINCONF_PARAM_DRIVE_TYPE, 57 - /* argument: pinmux settings */ 58 - TEGRA_PINCONF_PARAM_FUNCTION, 59 57 }; 60 58 61 59 enum tegra_pinconf_pull {