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

Commit 5219eedf authored by Peter Rosin's avatar Peter Rosin Committed by Greg Kroah-Hartman
Browse files

pinctrl: sx150x: Register pinctrl before adding the gpiochip 



commit 1a1d39e1b8dd1d0f92a79da4fcc1ab0be3ae9bfc upstream.

Various gpiolib activity depend on the pinctrl to be up and kicking.
Therefore, register the pinctrl before adding a gpiochip.

Suggested-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarPeter Rosin <peda@axentia.se>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 89cad3fa

drivers/pinctrl/pinctrl-sx150x.c

+21 −14
Original line number Diff line number Diff line
@@ -1144,6 +1144,27 @@ static int sx150x_probe(struct i2c_client *client, 
	if (ret)

		return ret;



	/* Pinctrl_desc */

	pctl->pinctrl_desc.name = "sx150x-pinctrl";

	pctl->pinctrl_desc.pctlops = &sx150x_pinctrl_ops;

	pctl->pinctrl_desc.confops = &sx150x_pinconf_ops;

	pctl->pinctrl_desc.pins = pctl->data->pins;

	pctl->pinctrl_desc.npins = pctl->data->npins;

	pctl->pinctrl_desc.owner = THIS_MODULE;



	ret = devm_pinctrl_register_and_init(dev, &pctl->pinctrl_desc,

					     pctl, &pctl->pctldev);

	if (ret) {

		dev_err(dev, "Failed to register pinctrl device\n");

		return ret;

	}



	ret = pinctrl_enable(pctl->pctldev);

	if (ret) {

		dev_err(dev, "Failed to enable pinctrl device\n");

		return ret;

	}



	/* Register GPIO controller */

	pctl->gpio.label = devm_kstrdup(dev, client->name, GFP_KERNEL);

	pctl->gpio.base = -1;
@@ -1217,20 +1238,6 @@ static int sx150x_probe(struct i2c_client *client, 
					    client->irq);

	}



	/* Pinctrl_desc */

	pctl->pinctrl_desc.name = "sx150x-pinctrl";

	pctl->pinctrl_desc.pctlops = &sx150x_pinctrl_ops;

	pctl->pinctrl_desc.confops = &sx150x_pinconf_ops;

	pctl->pinctrl_desc.pins = pctl->data->pins;

	pctl->pinctrl_desc.npins = pctl->data->npins;

	pctl->pinctrl_desc.owner = THIS_MODULE;



	pctl->pctldev = devm_pinctrl_register(dev, &pctl->pinctrl_desc, pctl);

	if (IS_ERR(pctl->pctldev)) {

		dev_err(dev, "Failed to register pinctrl device\n");

		return PTR_ERR(pctl->pctldev);

	}



	return 0;

}