Commit c3df1c7c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pinctrl-v4.11-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl 

Pull pin control fix from Linus Walleij:
 "This late fix for pin control is hopefully the last I send this cycle.

  The problem was detected early in the v4.11 release cycle and there
  has been some back and forth on how to solve it. Sadly the proper fix
  arrives late, but at least not too late.

  An issue was detected with pin control on the Freescale i.MX after the
  refactorings for more general group and function handling.

  We now have the proper fix for this"

* tag 'pinctrl-v4.11-4' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinctrl: core: Fix pinctrl_register_and_init() with pinctrl_enable()
parents 894ca30c 61187142

Documentation/pinctrl.txt

+7 −1
Original line number Diff line number Diff line
@@ -77,9 +77,15 @@ static struct pinctrl_desc foo_desc = { 


int __init foo_probe(void)

{

	int error;



	struct pinctrl_dev *pctl;



	return pinctrl_register_and_init(&foo_desc, <PARENT>, NULL, &pctl);

	error = pinctrl_register_and_init(&foo_desc, <PARENT>, NULL, &pctl);

	if (error)

		return error;



	return pinctrl_enable(pctl);

}



To enable the pinctrl subsystem and the subgroups for PINMUX and PINCONF and

drivers/pinctrl/core.c

+61 −36
Original line number Diff line number Diff line
@@ -2010,10 +2010,22 @@ out_err: 
	return ERR_PTR(ret);

}



static int pinctrl_create_and_start(struct pinctrl_dev *pctldev)

static int pinctrl_claim_hogs(struct pinctrl_dev *pctldev)

{

	pctldev->p = create_pinctrl(pctldev->dev, pctldev);

	if (!IS_ERR(pctldev->p)) {

	if (PTR_ERR(pctldev->p) == -ENODEV) {

		dev_dbg(pctldev->dev, "no hogs found\n");



		return 0;

	}



	if (IS_ERR(pctldev->p)) {

		dev_err(pctldev->dev, "error claiming hogs: %li\n",

			PTR_ERR(pctldev->p));



		return PTR_ERR(pctldev->p);

	}



	kref_get(&pctldev->p->users);

	pctldev->hog_default =

		pinctrl_lookup_state(pctldev->p, PINCTRL_STATE_DEFAULT);
@@ -2033,6 +2045,22 @@ static int pinctrl_create_and_start(struct pinctrl_dev *pctldev) 
	if (IS_ERR(pctldev->hog_sleep))

		dev_dbg(pctldev->dev,

			"failed to lookup the sleep state\n");



	return 0;

}



int pinctrl_enable(struct pinctrl_dev *pctldev)

{

	int error;



	error = pinctrl_claim_hogs(pctldev);

	if (error) {

		dev_err(pctldev->dev, "could not claim hogs: %i\n",

			error);

		mutex_destroy(&pctldev->mutex);

		kfree(pctldev);



		return error;

	}



	mutex_lock(&pinctrldev_list_mutex);
@@ -2043,6 +2071,7 @@ static int pinctrl_create_and_start(struct pinctrl_dev *pctldev) 


	return 0;

}

EXPORT_SYMBOL_GPL(pinctrl_enable);



/**

 * pinctrl_register() - register a pin controller device
@@ -2065,25 +2094,30 @@ struct pinctrl_dev *pinctrl_register(struct pinctrl_desc *pctldesc, 
	if (IS_ERR(pctldev))

		return pctldev;



	error = pinctrl_create_and_start(pctldev);

	if (error) {

		mutex_destroy(&pctldev->mutex);

		kfree(pctldev);



	error = pinctrl_enable(pctldev);

	if (error)

		return ERR_PTR(error);

	}



	return pctldev;



}

EXPORT_SYMBOL_GPL(pinctrl_register);



/**

 * pinctrl_register_and_init() - register and init pin controller device

 * @pctldesc: descriptor for this pin controller

 * @dev: parent device for this pin controller

 * @driver_data: private pin controller data for this pin controller

 * @pctldev: pin controller device

 *

 * Note that pinctrl_enable() still needs to be manually called after

 * this once the driver is ready.

 */

int pinctrl_register_and_init(struct pinctrl_desc *pctldesc,

			      struct device *dev, void *driver_data,

			      struct pinctrl_dev **pctldev)

{

	struct pinctrl_dev *p;

	int error;



	p = pinctrl_init_controller(pctldesc, dev, driver_data);

	if (IS_ERR(p))
@@ -2097,15 +2131,6 @@ int pinctrl_register_and_init(struct pinctrl_desc *pctldesc, 
	 */

	*pctldev = p;



	error = pinctrl_create_and_start(p);

	if (error) {

		mutex_destroy(&p->mutex);

		kfree(p);

		*pctldev = NULL;



		return error;

	}



	return 0;

}

EXPORT_SYMBOL_GPL(pinctrl_register_and_init);

drivers/pinctrl/freescale/pinctrl-imx.c

+1 −1
Original line number Diff line number Diff line
@@ -790,7 +790,7 @@ int imx_pinctrl_probe(struct platform_device *pdev, 


	dev_info(&pdev->dev, "initialized IMX pinctrl driver\n");



	return 0;

	return pinctrl_enable(ipctl->pctl);



free:

	imx_free_resources(ipctl);

drivers/pinctrl/pinctrl-single.c

+1 −1
Original line number Diff line number Diff line
@@ -1781,7 +1781,7 @@ static int pcs_probe(struct platform_device *pdev) 
	dev_info(pcs->dev, "%i pins at pa %p size %u\n",

		 pcs->desc.npins, pcs->base, pcs->size);



	return 0;

	return pinctrl_enable(pcs->pctl);



free:

	pcs_free_resources(pcs);

drivers/pinctrl/sh-pfc/pinctrl.c

+9 −2
Original line number Diff line number Diff line
@@ -816,6 +816,13 @@ int sh_pfc_register_pinctrl(struct sh_pfc *pfc) 
	pmx->pctl_desc.pins = pmx->pins;

	pmx->pctl_desc.npins = pfc->info->nr_pins;



	return devm_pinctrl_register_and_init(pfc->dev, &pmx->pctl_desc, pmx,

	ret = devm_pinctrl_register_and_init(pfc->dev, &pmx->pctl_desc, pmx,

					     &pmx->pctl);

	if (ret) {

		dev_err(pfc->dev, "could not register: %i\n", ret);



		return ret;

	}



	return pinctrl_enable(pmx->pctl);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE