Commit fcbcfe5c authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Linus Walleij
Browse files

pinctrl: starfive: Convert to use grp member 



Convert drivers to use grp member embedded in struct group_desc,
because other members will be removed to avoid duplication and
desynchronisation of the generic pin group description.

Reviewed-by: default avatarEmil Renner Berthing <emil.renner.berthing@canonical.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20231211190321.307330-13-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent fc7d3b60

drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c

+4 −4
Original line number Diff line number Diff line
@@ -654,7 +654,7 @@ static int starfive_set_mux(struct pinctrl_dev *pctldev, 
		return -EINVAL;



	pinmux = group->data;

	for (i = 0; i < group->num_pins; i++) {

	for (i = 0; i < group->grp.npins; i++) {

		u32 v = pinmux[i];

		unsigned int gpio = starfive_pinmux_to_gpio(v);

		u32 dout = starfive_pinmux_to_dout(v);
@@ -797,7 +797,7 @@ static int starfive_pinconf_group_get(struct pinctrl_dev *pctldev, 
	if (!group)

		return -EINVAL;



	return starfive_pinconf_get(pctldev, group->pins[0], config);

	return starfive_pinconf_get(pctldev, group->grp.pins[0], config);

}



static int starfive_pinconf_group_set(struct pinctrl_dev *pctldev,
@@ -876,8 +876,8 @@ static int starfive_pinconf_group_set(struct pinctrl_dev *pctldev, 
		}

	}



	for (i = 0; i < group->num_pins; i++)

		starfive_padctl_rmw(sfp, group->pins[i], mask, value);

	for (i = 0; i < group->grp.npins; i++)

		starfive_padctl_rmw(sfp, group->grp.pins[i], mask, value);



	return 0;

}

drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c

+4 −4
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ static int jh7110_set_mux(struct pinctrl_dev *pctldev, 
		return -EINVAL;



	pinmux = group->data;

	for (i = 0; i < group->num_pins; i++) {

	for (i = 0; i < group->grp.npins; i++) {

		u32 v = pinmux[i];



		if (info->jh7110_set_one_pin_mux)
@@ -437,7 +437,7 @@ static int jh7110_pinconf_group_get(struct pinctrl_dev *pctldev, 
	if (!group)

		return -EINVAL;



	return jh7110_pinconf_get(pctldev, group->pins[0], config);

	return jh7110_pinconf_get(pctldev, group->grp.pins[0], config);

}



static int jh7110_pinconf_group_set(struct pinctrl_dev *pctldev,
@@ -508,8 +508,8 @@ static int jh7110_pinconf_group_set(struct pinctrl_dev *pctldev, 
		}

	}



	for (i = 0; i < group->num_pins; i++)

		jh7110_padcfg_rmw(sfp, group->pins[i], mask, value);

	for (i = 0; i < group->grp.npins; i++)

		jh7110_padcfg_rmw(sfp, group->grp.pins[i], mask, value);



	return 0;

}