Commit 63e006c1 authored Nov 04, 2019 by Amelie Delaunay Committed by Linus Walleij Nov 07, 2019

pinctrl: stmfx: fix valid_mask init sequence

With stmfx_pinctrl_gpio_init_valid_mask callback, gpio_valid_mask was used
to initialize gpiochip valid_mask for gpiolib. But gpio_valid_mask was not
yet initialized. gpio_valid_mask required gpio-ranges to be registered,
this is the case after gpiochip_add_data call. But init_valid_mask
callback is also called under gpiochip_add_data. gpio_valid_mask
initialization cannot be moved before gpiochip_add_data because
gpio-ranges are not registered.
So, it is not possible to use init_valid_mask callback.
To avoid this issue, get rid of valid_mask and rely on ranges.

Fixes: da9b142a ("pinctrl: stmfx: Use the callback to populate valid_mask")
Signed-off-by: Amelie Delaunay <amelie.delaunay@st.com>
Link: https://lore.kernel.org/r/20191104100908.10880-1-amelie.delaunay@st.com

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

parent 451a59bd

drivers/pinctrl/pinctrl-stmfx.c

+0 −14

Original line number	Diff line number	Diff line
		@@ -585,19 +585,6 @@ static int stmfx_pinctrl_gpio_function_enable(struct stmfx_pinctrl *pctl)
		return stmfx_function_enable(pctl->stmfx, func);
		}

		static int stmfx_pinctrl_gpio_init_valid_mask(struct gpio_chip *gc,
		unsigned long *valid_mask,
		unsigned int ngpios)
		{
		struct stmfx_pinctrl *pctl = gpiochip_get_data(gc);
		u32 n;

		for_each_clear_bit(n, &pctl->gpio_valid_mask, ngpios)
		clear_bit(n, valid_mask);

		return 0;
		}

		static int stmfx_pinctrl_probe(struct platform_device *pdev)
		{
		struct stmfx *stmfx = dev_get_drvdata(pdev->dev.parent);
		@@ -660,7 +647,6 @@ static int stmfx_pinctrl_probe(struct platform_device *pdev)
		pctl->gpio_chip.ngpio = pctl->pctl_desc.npins;
		pctl->gpio_chip.can_sleep = true;
		pctl->gpio_chip.of_node = np;
		pctl->gpio_chip.init_valid_mask = stmfx_pinctrl_gpio_init_valid_mask;

		ret = devm_gpiochip_add_data(pctl->dev, &pctl->gpio_chip, pctl);
		if (ret) {