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

Commit ae6efcae authored by Sean Wang's avatar Sean Wang Committed by Linus Walleij
Browse files

pinctrl: mt7622: fix that pinctrl_claim_hogs cannot work 



To allow claiming hogs by pinctrl, we cannot enable pinctrl until all
groups and functions are being added done. Also, it's necessary that
the corresponding gpiochip is being added when the pinctrl device is
enabled.

Cc: stable@vger.kernel.org
Fixes: d6ed9355 ("pinctrl: mediatek: add pinctrl driver for MT7622 SoC")
Signed-off-by: default avatarSean Wang <sean.wang@mediatek.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 8875059d

drivers/pinctrl/mediatek/pinctrl-mt7622.c

+12 −3
Original line number Diff line number Diff line
@@ -1695,9 +1695,10 @@ static int mtk_pinctrl_probe(struct platform_device *pdev) 
	mtk_desc.custom_conf_items = mtk_conf_items;

#endif



	hw->pctrl = devm_pinctrl_register(&pdev->dev, &mtk_desc, hw);

	if (IS_ERR(hw->pctrl))

		return PTR_ERR(hw->pctrl);

	err = devm_pinctrl_register_and_init(&pdev->dev, &mtk_desc, hw,

					     &hw->pctrl);

	if (err)

		return err;



	/* Setup groups descriptions per SoC types */

	err = mtk_build_groups(hw);
@@ -1713,11 +1714,19 @@ static int mtk_pinctrl_probe(struct platform_device *pdev) 
		return err;

	}



	/* For able to make pinctrl_claim_hogs, we must not enable pinctrl

	 * until all groups and functions are being added one.

	 */

	err = pinctrl_enable(hw->pctrl);

	if (err)

		return err;



	err = mtk_build_eint(hw, pdev);

	if (err)

		dev_warn(&pdev->dev,

			 "Failed to add EINT, but pinctrl still can work\n");



	/* Build gpiochip should be after pinctrl_enable is done */

	err = mtk_build_gpiochip(hw, pdev->dev.of_node);

	if (err) {

		dev_err(&pdev->dev, "Failed to add gpio_chip\n");