Commit a42c7d95 authored by Prathamesh Shete's avatar Prathamesh Shete Committed by Linus Walleij
Browse files

pinctrl: tegra: Use correct offset for pin group 



Function tegra_pinctrl_gpio_request_enable() and
tegra_pinctrl_gpio_disable_free() uses pin offset instead
of group offset, causing the driver to use wrong offset
to enable gpio.

Add a helper function tegra_pinctrl_get_group() to parse the
pin group and determine correct offset.

Signed-off-by: default avatarKartik K <kkartik@nvidia.com>
Signed-off-by: default avatarPrathamesh Shete <pshete@nvidia.com>
Link: https://lore.kernel.org/r/20211025110959.27751-1-pshete@nvidia.com


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent c7892ae1

drivers/pinctrl/tegra/pinctrl-tegra.c

+31 −2
Original line number Original line Diff line number Diff line
@@ -275,6 +275,29 @@ static int tegra_pinctrl_set_mux(struct pinctrl_dev *pctldev, 
	return 0;

	return 0;

}

}





static struct tegra_pingroup *tegra_pinctrl_get_group(struct pinctrl_dev *pctldev,

					unsigned int offset)

{

	struct tegra_pmx *pmx = pinctrl_dev_get_drvdata(pctldev);

	struct tegra_pingroup *g;

	unsigned int group, num_pins, j;

	const unsigned int *pins;

	int ret;



	for (group = 0; group < pmx->soc->ngroups; ++group) {

		ret = tegra_pinctrl_get_group_pins(pctldev, group, &pins, &num_pins);

		if (ret < 0)

			continue;

		for (j = 0; j < num_pins; j++) {

			if (offset == pins[j])

				return &pmx->soc->groups[group];

		}

	}



	dev_err(pctldev->dev, "Pingroup not found for pin %u\n", offset);

	return NULL;

}



static int tegra_pinctrl_gpio_request_enable(struct pinctrl_dev *pctldev,

static int tegra_pinctrl_gpio_request_enable(struct pinctrl_dev *pctldev,

					     struct pinctrl_gpio_range *range,

					     struct pinctrl_gpio_range *range,

					     unsigned int offset)

					     unsigned int offset)
@@ -286,7 +309,10 @@ static int tegra_pinctrl_gpio_request_enable(struct pinctrl_dev *pctldev, 
	if (!pmx->soc->sfsel_in_mux)

	if (!pmx->soc->sfsel_in_mux)

		return 0;

		return 0;





	group = &pmx->soc->groups[offset];

	group = tegra_pinctrl_get_group(pctldev, offset);



	if (!group)

		return -EINVAL;





	if (group->mux_reg < 0 || group->sfsel_bit < 0)

	if (group->mux_reg < 0 || group->sfsel_bit < 0)

		return -EINVAL;

		return -EINVAL;
@@ -309,7 +335,10 @@ static void tegra_pinctrl_gpio_disable_free(struct pinctrl_dev *pctldev, 
	if (!pmx->soc->sfsel_in_mux)

	if (!pmx->soc->sfsel_in_mux)

		return;

		return;





	group = &pmx->soc->groups[offset];

	group = tegra_pinctrl_get_group(pctldev, offset);



	if (!group)

		return -EINVAL;





	if (group->mux_reg < 0 || group->sfsel_bit < 0)

	if (group->mux_reg < 0 || group->sfsel_bit < 0)

		return;

		return;