UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Peng 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: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Peng Fan 2016-05-18 17:31:59 +08:00 committed by Linus Walleij
parent a454c67d1f
commit 6e408ed8be
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/pinctrl/freescale/pinctrl-imx.c
View File

@ -513,13 +513,6 @@ static const struct pinconf_ops imx_pinconf_ops = {
.pin_config_group_dbg_show = imx_pinconf_group_dbg_show, .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 * 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. * 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 regmap_config config = { .name = "gpr" };
struct device_node *dev_np = pdev->dev.of_node; struct device_node *dev_np = pdev->dev.of_node;
struct pinctrl_desc *imx_pinctrl_desc;
struct device_node *np; struct device_node *np;
struct imx_pinctrl *ipctl; struct imx_pinctrl *ipctl;
struct resource *res; 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 = devm_kzalloc(&pdev->dev, sizeof(*imx_pinctrl_desc),
imx_pinctrl_desc.pins = info->pins; GFP_KERNEL);
imx_pinctrl_desc.npins = info->npins; 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); ret = imx_pinctrl_probe_dt(pdev, info);
if (ret) { if (ret) {
@ -789,7 +792,8 @@ int imx_pinctrl_probe(struct platform_device *pdev,
ipctl->info = info; ipctl->info = info;
ipctl->dev = info->dev; ipctl->dev = info->dev;
platform_set_drvdata(pdev, ipctl); 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)) { if (IS_ERR(ipctl->pctl)) {
dev_err(&pdev->dev, "could not register IMX pinctrl driver\n"); dev_err(&pdev->dev, "could not register IMX pinctrl driver\n");
return PTR_ERR(ipctl->pctl); return PTR_ERR(ipctl->pctl);