Commit fc4f351a authored by Dong Aisheng's avatar Dong Aisheng Committed by Linus Walleij
Browse files

pinctrl: imx: switch to use the generic pinmux property 



The generic pinmux property seems to be more suitable for IMX.
So we change to use 'pinmux' instead of 'pins'.

Cc: Bai Ping <ping.bai@nxp.com>
Acked-by: default avatarShawn Guo <shawnguo@kernel.org>
Signed-off-by: default avatarDong Aisheng <aisheng.dong@nxp.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent a6214218

drivers/pinctrl/freescale/pinctrl-imx.c

+3 −3
Original line number Diff line number Diff line
@@ -563,14 +563,14 @@ static int imx_pinctrl_parse_groups(struct device_node *np, 
	 * do sanity check and calculate pins number

	 *

	 * First try legacy 'fsl,pins' property, then fall back to the

	 * generic 'pins'.

	 * generic 'pinmux'.

	 *

	 * Note: for generic 'pins' case, there's no CONFIG part in

	 * Note: for generic 'pinmux' case, there's no CONFIG part in

	 * the binding format.

	 */

	list = of_get_property(np, "fsl,pins", &size);

	if (!list) {

		list = of_get_property(np, "pins", &size);

		list = of_get_property(np, "pinmux", &size);

		if (!list) {

			dev_err(info->dev,

				"no fsl,pins and pins property in node %s\n",