Commit 5fcdf6a7 authored by Markus Pargmann's avatar Markus Pargmann Committed by Linus Walleij

pinctrl: imx: Allow parsing DT without function nodes

The old format to define pinctrl settings for imx in DT has two
hierarchy levels. The first level are function device nodes. The second
level are pingroups which contain a property fsl,pins. The original
intention was to define all pin functions in a single dtsi file and just
reference the correct ones in the board files.
This idea was rejected some time ago leading to the current design to
have all the pinfunctions defined in the board files. So we don't need
the function device nodes anymore.

This patch changes the pinctrl driver to accept devicetrees which do not
have the first hierarchy level, function device nodes. For example
karo-tx25 already has such a devicetree. Old devicetrees are still
parsed and supported.
Signed-off-by: default avatarMarkus Pargmann <mpa@pengutronix.de>
Acked-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 83a21727
...@@ -606,6 +606,29 @@ static int imx_pinctrl_parse_functions(struct device_node *np, ...@@ -606,6 +606,29 @@ static int imx_pinctrl_parse_functions(struct device_node *np,
return 0; return 0;
} }
/*
* Check if the DT contains pins in the direct child nodes. This indicates the
* newer DT format to store pins. This function returns true if the first found
* fsl,pins property is in a child of np. Otherwise false is returned.
*/
static bool imx_pinctrl_dt_is_flat_functions(struct device_node *np)
{
struct device_node *function_np;
struct device_node *pinctrl_np;
for_each_child_of_node(np, function_np) {
if (of_property_read_bool(function_np, "fsl,pins"))
return true;
for_each_child_of_node(function_np, pinctrl_np) {
if (of_property_read_bool(pinctrl_np, "fsl,pins"))
return false;
}
}
return true;
}
static int imx_pinctrl_probe_dt(struct platform_device *pdev, static int imx_pinctrl_probe_dt(struct platform_device *pdev,
struct imx_pinctrl_soc_info *info) struct imx_pinctrl_soc_info *info)
{ {
...@@ -613,14 +636,20 @@ static int imx_pinctrl_probe_dt(struct platform_device *pdev, ...@@ -613,14 +636,20 @@ static int imx_pinctrl_probe_dt(struct platform_device *pdev,
struct device_node *child; struct device_node *child;
u32 nfuncs = 0; u32 nfuncs = 0;
u32 i = 0; u32 i = 0;
bool flat_funcs;
if (!np) if (!np)
return -ENODEV; return -ENODEV;
nfuncs = of_get_child_count(np); flat_funcs = imx_pinctrl_dt_is_flat_functions(np);
if (nfuncs <= 0) { if (flat_funcs) {
dev_err(&pdev->dev, "no functions defined\n"); nfuncs = 1;
return -EINVAL; } else {
nfuncs = of_get_child_count(np);
if (nfuncs <= 0) {
dev_err(&pdev->dev, "no functions defined\n");
return -EINVAL;
}
} }
info->nfunctions = nfuncs; info->nfunctions = nfuncs;
...@@ -629,16 +658,24 @@ static int imx_pinctrl_probe_dt(struct platform_device *pdev, ...@@ -629,16 +658,24 @@ static int imx_pinctrl_probe_dt(struct platform_device *pdev,
if (!info->functions) if (!info->functions)
return -ENOMEM; return -ENOMEM;
info->ngroups = 0; if (flat_funcs) {
for_each_child_of_node(np, child) info->ngroups = of_get_child_count(np);
info->ngroups += of_get_child_count(child); } else {
info->ngroups = 0;
for_each_child_of_node(np, child)
info->ngroups += of_get_child_count(child);
}
info->groups = devm_kzalloc(&pdev->dev, info->ngroups * sizeof(struct imx_pin_group), info->groups = devm_kzalloc(&pdev->dev, info->ngroups * sizeof(struct imx_pin_group),
GFP_KERNEL); GFP_KERNEL);
if (!info->groups) if (!info->groups)
return -ENOMEM; return -ENOMEM;
for_each_child_of_node(np, child) if (flat_funcs) {
imx_pinctrl_parse_functions(child, info, i++); imx_pinctrl_parse_functions(np, info, 0);
} else {
for_each_child_of_node(np, child)
imx_pinctrl_parse_functions(child, info, i++);
}
return 0; return 0;
} }
......
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