Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7afde8ba authored by Linus Walleij's avatar Linus Walleij
Browse files

pinctrl: move group lookup to core 



Now also the core needs to look up pin groups so move the lookup
function there and expose it in the internal header.

Acked-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent b84e673f

drivers/pinctrl/core.c

+31 −0
Original line number Diff line number Diff line
@@ -284,6 +284,37 @@ void pinctrl_remove_gpio_range(struct pinctrl_dev *pctldev, 
	mutex_unlock(&pctldev->gpio_ranges_lock);

}



/**

 * pinctrl_get_group_selector() - returns the group selector for a group

 * @pctldev: the pin controller handling the group

 * @pin_group: the pin group to look up

 */

int pinctrl_get_group_selector(struct pinctrl_dev *pctldev,

			       const char *pin_group)

{

	const struct pinctrl_ops *pctlops = pctldev->desc->pctlops;

	unsigned group_selector = 0;



	while (pctlops->list_groups(pctldev, group_selector) >= 0) {

		const char *gname = pctlops->get_group_name(pctldev,

							    group_selector);

		if (!strcmp(gname, pin_group)) {

			dev_dbg(&pctldev->dev,

				"found group selector %u for %s\n",

				group_selector,

				pin_group);

			return group_selector;

		}



		group_selector++;

	}



	dev_err(&pctldev->dev, "does not have pin group %s\n",

		pin_group);



	return -EINVAL;

}



#ifdef CONFIG_DEBUG_FS



static int pinctrl_pins_show(struct seq_file *s, void *what)

drivers/pinctrl/core.h

+2 −0
Original line number Diff line number Diff line
@@ -69,3 +69,5 @@ struct pin_desc *pin_desc_get(struct pinctrl_dev *pctldev, int pin); 
int pinctrl_get_device_gpio_range(unsigned gpio,

				  struct pinctrl_dev **outdev,

				  struct pinctrl_gpio_range **outrange);

int pinctrl_get_group_selector(struct pinctrl_dev *pctldev,

			       const char *pin_group);

drivers/pinctrl/pinmux.c

+2 −33
Original line number Diff line number Diff line
@@ -389,37 +389,6 @@ static void release_pins(struct pinctrl_dev *pctldev, 
		pin_free(pctldev, pins[i], false);

}



/**

 * pinmux_get_group_selector() - returns the group selector for a group

 * @pctldev: the pin controller handling the group

 * @pin_group: the pin group to look up

 */

static int pinmux_get_group_selector(struct pinctrl_dev *pctldev,

				     const char *pin_group)

{

	const struct pinctrl_ops *pctlops = pctldev->desc->pctlops;

	unsigned group_selector = 0;



	while (pctlops->list_groups(pctldev, group_selector) >= 0) {

		const char *gname = pctlops->get_group_name(pctldev,

							    group_selector);

		if (!strcmp(gname, pin_group)) {

			dev_dbg(&pctldev->dev,

				"found group selector %u for %s\n",

				group_selector,

				pin_group);

			return group_selector;

		}



		group_selector++;

	}



	dev_err(&pctldev->dev, "does not have pin group %s\n",

		pin_group);



	return -EINVAL;

}



/**

 * pinmux_check_pin_group() - check function and pin group combo

 * @pctldev: device to check the pin group vs function for
@@ -461,7 +430,7 @@ static int pinmux_check_pin_group(struct pinctrl_dev *pctldev, 
			return ret;

		if (num_groups < 1)

			return -EINVAL;

		ret = pinmux_get_group_selector(pctldev, groups[0]);

		ret = pinctrl_get_group_selector(pctldev, groups[0]);

		if (ret < 0) {

			dev_err(&pctldev->dev,

				"function %s wants group %s but the pin "
@@ -486,7 +455,7 @@ static int pinmux_check_pin_group(struct pinctrl_dev *pctldev, 
		"check if we have pin group %s on controller %s\n",

		pin_group, pinctrl_dev_get_name(pctldev));



	ret = pinmux_get_group_selector(pctldev, pin_group);

	ret = pinctrl_get_group_selector(pctldev, pin_group);

	if (ret < 0) {

		dev_dbg(&pctldev->dev,

			"%s does not support pin group %s with function %s\n",