mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

pinctrl: ingenic: 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.

Acked-by: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20231211190321.307330-9-andriy.shevchenko@linux.intel.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Andy Shevchenko 2023-12-11 20:58:01 +02:00 committed by Linus Walleij
parent 390270f25b
commit 10ce59c6bb
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/pinctrl/pinctrl-ingenic.c
View File

@ -84,17 +84,13 @@
#define INGENIC_PIN_GROUP_FUNCS(_name_, id, funcs) \
{ \
.name = _name_, \
.pins = id##_pins, \
.num_pins = ARRAY_SIZE(id##_pins), \
.grp = PINCTRL_PINGROUP(_name_, id##_pins, ARRAY_SIZE(id##_pins)), \
.data = funcs, \
}
#define INGENIC_PIN_GROUP(_name_, id, func) \
{ \
.name = _name_, \
.pins = id##_pins, \
.num_pins = ARRAY_SIZE(id##_pins), \
.grp = PINCTRL_PINGROUP(_name_, id##_pins, ARRAY_SIZE(id##_pins)), \
.data = (void *)func, \
}
@ -3766,17 +3762,17 @@ static int ingenic_pinmux_set_mux(struct pinctrl_dev *pctldev,
return -EINVAL;
dev_dbg(pctldev->dev, "enable function %s group %s\n",
func->name, grp->name);
func->name, grp->grp.name);
mode = (uintptr_t)grp->data;
if (mode <= 3) {
for (i = 0; i < grp->num_pins; i++)
ingenic_pinmux_set_pin_fn(jzpc, grp->pins[i], mode);
for (i = 0; i < grp->grp.npins; i++)
ingenic_pinmux_set_pin_fn(jzpc, grp->grp.pins[i], mode);
} else {
pin_modes = grp->data;
for (i = 0; i < grp->num_pins; i++)
ingenic_pinmux_set_pin_fn(jzpc, grp->pins[i], pin_modes[i]);
for (i = 0; i < grp->grp.npins; i++)
ingenic_pinmux_set_pin_fn(jzpc, grp->grp.pins[i], pin_modes[i]);
}
return 0;
@ -4303,12 +4299,12 @@ static int __init ingenic_pinctrl_probe(struct platform_device *pdev)
for (i = 0; i < chip_info->num_groups; i++) {
const struct group_desc *group = &chip_info->groups[i];
const struct pingroup *grp = &group->grp;
err = pinctrl_generic_add_group(jzpc->pctl, group->name,
group->pins, group->num_pins, group->data);
err = pinctrl_generic_add_group(jzpc->pctl, grp->name, grp->pins, grp->npins,
group->data);
if (err < 0) {
dev_err(dev, "Failed to register group %s\n",
group->name);
dev_err(dev, "Failed to register group %s\n", grp->name);
return err;
}
}