Commit 13f2d25b authored by Haibo Chen's avatar Haibo Chen Committed by Linus Walleij

Revert "pinctrl: freescale: imx: Use 'devm_of_iomap()' to avoid a resource...

Revert "pinctrl: freescale: imx: Use 'devm_of_iomap()' to avoid a resource leak in case of error in 'imx_pinctrl_probe()'"

This reverts commit ba403242.

After commit 26d8cde5 ("pinctrl: freescale: imx: add shared
input select reg support"). i.MX7D has two iomux controllers
iomuxc and iomuxc-lpsr which share select_input register for
daisy chain settings.
If use 'devm_of_iomap()', when probe the iomuxc-lpsr, will call
devm_request_mem_region() for the region <0x30330000-0x3033ffff>
for the first time. Then, next time when probe the iomuxc, API
devm_platform_ioremap_resource() will also use the API
devm_request_mem_region() for the share region <0x30330000-0x3033ffff>
again, then cause issue, log like below:

[    0.179561] imx7d-pinctrl 302c0000.iomuxc-lpsr: initialized IMX pinctrl driver
[    0.191742] imx7d-pinctrl 30330000.pinctrl: can't request region for resource [mem 0x30330000-0x3033ffff]
[    0.191842] imx7d-pinctrl: probe of 30330000.pinctrl failed with error -16

Fixes: ba403242 ("pinctrl: freescale: imx: Use 'devm_of_iomap()' to avoid a resource leak in case of error in 'imx_pinctrl_probe()'")
Signed-off-by: default avatarHaibo Chen <haibo.chen@nxp.com>
Reviewed-by: default avatarDong Aisheng <aisheng.dong@nxp.com>
Link: https://lore.kernel.org/r/1591673223-1680-1-git-send-email-haibo.chen@nxp.comSigned-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 3e5b8f87
...@@ -824,13 +824,12 @@ int imx_pinctrl_probe(struct platform_device *pdev, ...@@ -824,13 +824,12 @@ int imx_pinctrl_probe(struct platform_device *pdev,
return -EINVAL; return -EINVAL;
} }
ipctl->input_sel_base = devm_of_iomap(&pdev->dev, np, ipctl->input_sel_base = of_iomap(np, 0);
0, NULL);
of_node_put(np); of_node_put(np);
if (IS_ERR(ipctl->input_sel_base)) { if (!ipctl->input_sel_base) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"iomuxc input select base address not found\n"); "iomuxc input select base address not found\n");
return PTR_ERR(ipctl->input_sel_base); return -ENOMEM;
} }
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment