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

Commit 6e408ed8 authored by Peng Fan's avatar Peng Fan Committed by Linus Walleij
Browse files

pinctrl: imx: fix initialization of imx_pinctrl_desc 



To i.MX7D, there are two iomux controllers, iomuxc and iomuxc_lpsr.
They should not share one pin controller descriptor, otherwise
the value filled into imx_pinctrl_desc when probing the first
iomux controller will be overridden when probing the second one.

In this patch, discard the static allcoated imx_pinctrl_desc and
switch to dynamically allcate pin controller descriptor for each
iomux controller.

Signed-off-by: default avatarPeng Fan <van.freenix@gmail.com>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Stefan Agner <stefan@agner.ch>
Cc: Vladimir Zapolskiy <vz@mleia.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent a454c67d

drivers/pinctrl/freescale/pinctrl-imx.c

+15 −11
Original line number Diff line number Diff line
@@ -513,13 +513,6 @@ static const struct pinconf_ops imx_pinconf_ops = { 
	.pin_config_group_dbg_show = imx_pinconf_group_dbg_show,

};



static struct pinctrl_desc imx_pinctrl_desc = {

	.pctlops = &imx_pctrl_ops,

	.pmxops = &imx_pmx_ops,

	.confops = &imx_pinconf_ops,

	.owner = THIS_MODULE,

};



/*

 * Each pin represented in fsl,pins consists of 5 u32 PIN_FUNC_ID and

 * 1 u32 CONFIG, so 24 types in total for each pin.
@@ -722,6 +715,7 @@ int imx_pinctrl_probe(struct platform_device *pdev, 
{

	struct regmap_config config = { .name = "gpr" };

	struct device_node *dev_np = pdev->dev.of_node;

	struct pinctrl_desc *imx_pinctrl_desc;

	struct device_node *np;

	struct imx_pinctrl *ipctl;

	struct resource *res;
@@ -776,9 +770,18 @@ int imx_pinctrl_probe(struct platform_device *pdev, 
		}

	}



	imx_pinctrl_desc.name = dev_name(&pdev->dev);

	imx_pinctrl_desc.pins = info->pins;

	imx_pinctrl_desc.npins = info->npins;

	imx_pinctrl_desc = devm_kzalloc(&pdev->dev, sizeof(*imx_pinctrl_desc),

					GFP_KERNEL);

	if (!imx_pinctrl_desc)

		return -ENOMEM;



	imx_pinctrl_desc->name = dev_name(&pdev->dev);

	imx_pinctrl_desc->pins = info->pins;

	imx_pinctrl_desc->npins = info->npins;

	imx_pinctrl_desc->pctlops = &imx_pctrl_ops,

	imx_pinctrl_desc->pmxops = &imx_pmx_ops,

	imx_pinctrl_desc->confops = &imx_pinconf_ops,

	imx_pinctrl_desc->owner = THIS_MODULE,



	ret = imx_pinctrl_probe_dt(pdev, info);

	if (ret) {
@@ -789,7 +792,8 @@ int imx_pinctrl_probe(struct platform_device *pdev, 
	ipctl->info = info;

	ipctl->dev = info->dev;

	platform_set_drvdata(pdev, ipctl);

	ipctl->pctl = devm_pinctrl_register(&pdev->dev, &imx_pinctrl_desc, ipctl);

	ipctl->pctl = devm_pinctrl_register(&pdev->dev,

					    imx_pinctrl_desc, ipctl);

	if (IS_ERR(ipctl->pctl)) {

		dev_err(&pdev->dev, "could not register IMX pinctrl driver\n");

		return PTR_ERR(ipctl->pctl);